Checkin of autoconf-style object root.

Use QMTest for the feature and Regression tests.
Continue using the Makefile system for the Programs tests.
Adjusted the Makefile rules to handle building outside the source directory.

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

diff --git a/test/Makefile b/test/Makefile
index 5e916c5d67e726be969588a17b0008d6c4d45d98..df389275e99dd398f30eefd86ea75c7816049e2c 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,12 @@
 LEVEL  = ..
-DIRS   = Feature Regression Programs
+DIRS   = Programs
 include Makefile.tests
 
+#
+# Make QMTest the default for testing features and regressions
+#
+all:: qmtest
+
 #
 # New QMTest functionality:
 #      The test suite is being transitioned over to QMTest.  Eventually, it
@@ -10,13 +15,7 @@ include Makefile.tests
 
 # List of the functioning QM Tests
 QMTESTS=feature \
-        regression.assembler \
-        regression.analysis \
-        regression.bugpoint \
-        regression.cbackend \
-        regression.jello \
-        regression.linker \
-        regression.other
+        regression
 
 # QMTest option specifying the location of the QMTest database.
 QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
@@ -27,12 +26,13 @@ QMDB= -D $(LLVM_SRC_ROOT)/test/QMTestDB
 #
 CONTEXT= -c srcroot=$(LLVM_SRC_ROOT) \
          -c buildroot=$(LLVM_OBJ_ROOT) \
-        -c buildtype=$(CONFIGURATION) \
+         -c buildtype=$(CONFIGURATION) \
          -c tmpdir=$(LLVM_OBJ_ROOT)/test/tmp \
-        -c cc=$(CC) \
-        -c cxx=$(CXX) \
-        -c "llvmgcc=$(LLVMGCC)" \
-        -c make=$(MAKE)
+         -c coresize=0 \
+         -c cc=$(CC) \
+         -c cxx=$(CXX) \
+         -c "llvmgcc=$(LLVMGCC)" \
+         -c make=$(MAKE)
 
 #
 # Location of the QMTest program.

diff --git a/test/Makefile.tests b/test/Makefile.tests
index b0801c3e620ae2ff9e9553a05595bd16cfa870b7..7b18402e366abdb6fb95e535ac3496cf1f8a2a59 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -56,10 +56,10 @@ LBUGPOINT= $(TOOLS)/bugpoint
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LEVEL)/test/Failure.sh
+FAILURE  = $(LLVM_SRC_ROOT)/test/Failure.sh
 TESTRUNR = @echo Running test: $<; \
-             PATH=$(LLVMTOOLCURRENT):$(LEVEL)/test/Scripts:$(PATH) \
-                  $(LEVEL)/test/TestRunner.sh
+             PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+                  $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 # Native Tool Definitions
 NATGCC  = $(CC)
@@ -85,15 +85,24 @@ clean::
        $(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll
-Output/%.ll: $(SourceDir)%.c $(LCC1) Output/.dir $(INCLUDES)
+Output/%.ll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
+       $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
        $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
 # Compile from X.cpp to Output/X.ll
-Output/%.ll: $(SourceDir)%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.ll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # Compile from X.cc to Output/X.ll
-Output/%.ll: $(SourceDir)%.cc $(LCC1XX) Output/.dir $(INCLUDES)
+Output/%.ll: $(SourceDir)/%.cc $(LCC1XX) Output/.dir $(INCLUDES)
+       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+
+Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
@@ -105,17 +114,27 @@ Output/%.bc: Output/%.ll $(LGCCAS)
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.
 #
-Output/%.bc: %.ll $(LAS) Output/.dir
+Output/%.bc: $(SourceDir)/%.ll $(LAS) Output/.dir
        $(LAS) -f $< -o $@
 
 #
 # Testing versions of provided utilities...
 #
+Output/%.tll: $(SourceDir)/%.c $(LCC1) Output/.dir $(INCLUDES)
+       @echo "======== Compiling $<"
+       $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
+           ( rm -f $@; $(FAILURE) $@ )
+
 Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
        @echo "======== Compiling $<"
        $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
            ( rm -f $@; $(FAILURE) $@ )
 
+Output/%.tll: $(SourceDir)/%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+       @echo "======== Compiling $<"
+       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
+           ( rm -f $@; $(FAILURE) $@ )
+
 Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
        @echo "======== Compiling $<"
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \