From: Daniel Dunbar <daniel@zuster.org>
Date: Sun, 13 Sep 2009 18:58:14 +0000 (+0000)
Subject: Revert unittests build changes temporarily, the unit test build isn't -j safe.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1026c163c82d4d3481548bf69a18ac10ebd728c6;p=oota-llvm.git

Revert unittests build changes temporarily, the unit test build isn't -j safe.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81692 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/Makefile b/Makefile
index 03ab0446522..b8d4367e72b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ ifeq ($(BUILD_DIRS_ONLY),1)
   OPTIONAL_DIRS :=
 else
   DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
-          tools runtime docs unittests
+          tools runtime docs
   OPTIONAL_DIRS := examples projects bindings
 endif
 
diff --git a/Makefile.rules b/Makefile.rules
index 7999c7a3ca9..8d1e621845a 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -19,11 +19,10 @@
 #--------------------------------------------------------------------
 # Define the various target sets
 #--------------------------------------------------------------------
-RecursiveTargets := all clean clean-all install uninstall install-bytecode \
-                    unitcheck
+RecursiveTargets := all clean clean-all install uninstall install-bytecode
 LocalTargets     := all-local clean-local clean-all-local check-local \
                     install-local printvars uninstall-local \
-		    install-bytecode-local
+		    install-bytecode-local unittests
 TopLevelTargets  := check dist dist-check dist-clean dist-gzip dist-bzip2 \
                     dist-zip unittests
 UserTargets      := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets)
@@ -801,7 +800,6 @@ clean-all:: $(addsuffix /.makeclean-all,$(PARALLEL_DIRS))
 install  :: $(addsuffix /.makeinstall  ,$(PARALLEL_DIRS))
 uninstall:: $(addsuffix /.makeuninstall,$(PARALLEL_DIRS))
 install-bytecode  :: $(addsuffix /.makeinstall-bytecode,$(PARALLEL_DIRS))
-unitcheck:: $(addsuffix /.makeunitcheck,$(PARALLEL_DIRS))
 
 ParallelTargets := $(foreach T,$(RecursiveTargets),%/.make$(T))
 
@@ -1621,7 +1619,7 @@ unittests::
 	$(Verb) if test -d "$(PROJ_OBJ_ROOT)/unittests" ; then \
 	  if test -f "$(PROJ_OBJ_ROOT)/unittests/Makefile" ; then \
 	    $(EchoCmd) Running unittests test suite ; \
-	    $(MAKE) -C $(PROJ_OBJ_ROOT)/unittests unitcheck; \
+	    $(MAKE) -C $(PROJ_OBJ_ROOT)/unittests ; \
 	  else \
 	    $(EchoCmd) No Makefile in unittests directory ; \
 	  fi ; \
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index 355e6a34f51..1c75e44d077 100644
--- a/unittests/Makefile.unittest
+++ b/unittests/Makefile.unittest
@@ -30,8 +30,6 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
           $(StripWarnMsg)
 
 all:: $(LLVMUnitTestExe)
-
-unitcheck:: $(LLVMUnitTestExe)
 	$(LLVMUnitTestExe)
 
 endif