New testcase

[oota-llvm.git] / test / Makefile.tests

diff --git a/test/Makefile.tests b/test/Makefile.tests
index faa5a0284eed7aea5ae2b902f63e1ca2ef96e2b3..7b18402e366abdb6fb95e535ac3496cf1f8a2a59 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -13,6 +13,9 @@ ifdef TEST
 test::
 endif
 
+# We do not want to make .d files for tests! 
+DISABLE_AUTO_DEPENDENCIES=1
+
 include ${LEVEL}/Makefile.common
 
 # Specify ENABLE_STATS on the command line to enable -stats and -time-passes
@@ -21,7 +24,6 @@ ifdef ENABLE_STATS
 STATS = -stats -time-passes
 endif
 
-
 .PHONY: clean default
 
 # These files, which might be intermediate results, should not be deleted by
@@ -43,9 +45,9 @@ LAS      = $(LLVMAS)    ## FIXME: remove these definitions, use LLVMAS directly
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
 LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
+LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
 LGCCLDPROG = $(TOOLS)/gccld
-LDIS     = $(TOOLS)/dis 
+LDIS     = $(TOOLS)/llvm-dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
 LANALYZE = $(TOOLS)/analyze
@@ -54,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)
@@ -83,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
@@ -103,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 $@ || \