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
This commit is contained in:
Daniel Dunbar 2009-09-13 18:58:14 +00:00
parent 2055bb31a5
commit 1026c163c8
3 changed files with 4 additions and 8 deletions

View File

@ -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

View File

@ -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 ; \

View File

@ -30,8 +30,6 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
$(StripWarnMsg)
all:: $(LLVMUnitTestExe)
unitcheck:: $(LLVMUnitTestExe)
$(LLVMUnitTestExe)
endif