[llvm-commits] CVS: llvm/test/Makefile.tests

[Brian Gaeke]

Changes in directory llvm/test:

Makefile.tests updated: 1.81 -> 1.82

---
Log message:

Remove dead definitions of NATGCC and CP, and dead .tll, .tbc rules.

Make should continue even if compilation cmds fail, for the sake of
the nightly tester, so use minuses on them.

Use LLVMAS, LLVMGCC, LLVMGXX instead of LAS, LCC, LCXX (as per FIXME).


---
Diffs of the changes:  (+6 -29)

Index: llvm/test/Makefile.tests
diff -u llvm/test/Makefile.tests:1.81 llvm/test/Makefile.tests:1.82
--- llvm/test/Makefile.tests:1.81	Sat Nov 29 03:49:14 2003
+++ llvm/test/Makefile.tests	Tue Jan 13 15:56:30 2004
@@ -60,10 +60,6 @@
              PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
                   $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
-# Native Tool Definitions
-NATGCC  = $(CC)
-CP	= /bin/cp -f
-
 ## If TRACE or TRACEM is "yes", set the appropriate llc flag (-trace or -tracem)
 ## mark that tracing on, and set the TRACELIBS variable.
 TRACEFLAGS = 
@@ -85,46 +81,27 @@
 
 # Compile from X.c to Output/X.ll
 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+	-$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
 
 # Compile from X.cpp to Output/X.ll
 Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+	-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # Compile from X.cc to Output/X.ll
 Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
+	-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
 # from GCC output, so use GCCAS.
 #
 Output/%.bc: Output/%.ll $(LGCCAS)
-	$(LGCCAS) $(STATS) $< -o $@
+	-$(LLVMAS) $(STATS) $< -o $@
 
 # 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
-	$(LAS) -f $< -o $@
-
-#
-# Testing versions of provided utilities...
-#
-Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
-	@echo "======== Compiling $<"
-	$(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
-	    ( rm -f $@; $(FAILURE) $@ )
-
-Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	@echo "======== Compiling $<"
-	$(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
-	    ( rm -f $@; $(FAILURE) $@ )
-
-Output/%.tbc: Output/%.tll $(LAS)
-	@echo "======== Assembling $<"
-	$(LAS) -f $< -o $@ || \
-            ( rm -f $@; $(FAILURE) $@ )
-
+Output/%.bc: %.ll $(LLVMAS) Output/.dir
+	-$(LLVMAS) -f $< -o $@
 
 ## Cancel built-in implicit rules that override above rules
 %: %.s