Index: test/Makefile
===================================================================
--- test/Makefile	(revision 159991)
+++ test/Makefile	(working copy)
@@ -62,8 +62,17 @@
 	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/clang/test lit.site.cfg Unit/lit.site.cfg
 extra-site-cfgs:: clang-site-cfg
 endif
+
+ifeq ($(NOCLING)$(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
 endif
 endif
+endif
 
 # ulimits like these are redundantly enforced by the buildbots, so
 # just removing them here won't work.

Index: test/Makefile
===================================================================
--- test/Makefile	(revision 161655)
+++ test/Makefile	(working copy)
@@ -63,6 +63,15 @@
 extra-site-cfgs:: clang-site-cfg
 endif
 
+ifeq ($(NOCLING)$(shell test -f $(PROJ_OBJ_DIR)/../tools/cling/Makefile && echo OK), OK)
+LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/cling/test
+
+# Force creation of Cling's lit.site.cfg.
+cling-lit-site-cfg: FORCE
+	$(MAKE) -C $(PROJ_OBJ_DIR)/../tools/cling/test lit.site.cfg
+extra-lit-site-cfgs:: cling-lit-site-cfg
+endif
+
 ifeq ($(shell test -f $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/Makefile && echo OK), OK)
 LIT_ALL_TESTSUITES += $(PROJ_OBJ_DIR)/../tools/clang/tools/extra/test
 

Update our patch in llvm test system.
Update our patch in llvm test system.


git-svn-id: ecbadac9c76e8cf640a0bca86f6bd796c98521e3@45544 27541ba8-7e3a-0410-8455-c3a389f83636
