[llvm-commits] [test-suite] r67782 - in /test-suite/trunk: TEST.nightly.Makefile TEST.nightly2.Makefile

[Dan Gohman]

Author: djg
Date: Thu Mar 26 17:56:02 2009
New Revision: 67782

URL: http://llvm.org/viewvc/llvm-project?rev=67782&view=rev
Log:
Don't generate the "compile" report if LLVM bytecode files are
not being generated. And set REPORT_DEPENDENCIES according to
the tools that are actually being tested. These changes make
it easier to run the test-suite in native-only mode.

Modified:
    test-suite/trunk/TEST.nightly.Makefile
    test-suite/trunk/TEST.nightly2.Makefile

Modified: test-suite/trunk/TEST.nightly.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly.Makefile?rev=67782&r1=67781&r2=67782&view=diff

==============================================================================
--- test-suite/trunk/TEST.nightly.Makefile (original)
+++ test-suite/trunk/TEST.nightly.Makefile Thu Mar 26 17:56:02 2009
@@ -9,21 +9,27 @@
 PROGDIR := $(PROJ_SRC_ROOT)
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
-REPORTS_TO_GEN := compile nat
+REPORTS_TO_GEN := nat
+REPORT_DEPENDENCIES :=
 ifndef DISABLE_LLC
-REPORTS_TO_GEN +=  llc
+REPORTS_TO_GEN +=  llc compile
+REPORT_DEPENDENCIES += $(LLC) $(LOPT)
 endif
 ifndef DISABLE_JIT
-REPORTS_TO_GEN +=  jit
+REPORTS_TO_GEN +=  jit compile
+REPORT_DEPENDENCIES += $(LLI) $(LOPT)
 endif
 ifndef DISABLE_CBE
-REPORTS_TO_GEN +=  cbe
+REPORTS_TO_GEN +=  cbe compile
+REPORT_DEPENDENCIES += $(CBE) $(LOPT)
 endif
 ifdef ENABLE_LLCBETA
-REPORTS_TO_GEN += llc-beta
+REPORTS_TO_GEN += llc-beta compile
+REPORT_DEPENDENCIES += $(LLC) $(LOPT)
 endif
 ifdef ENABLE_OPTBETA
-REPORTS_TO_GEN += opt-beta
+REPORTS_TO_GEN += opt-beta compile
+REPORT_DEPENDENCIES += $(LOPT)
 endif
 REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN))
 
@@ -149,5 +155,3 @@
 	@echo ">>> ========= '$(RELDIR)/$*' Program"
 	@echo "---------------------------------------------------------------"
 	@-cat $<
-
-REPORT_DEPENDENCIES := $(LOPT) $(LLI) $(LLC)

Modified: test-suite/trunk/TEST.nightly2.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly2.Makefile?rev=67782&r1=67781&r2=67782&view=diff

==============================================================================
--- test-suite/trunk/TEST.nightly2.Makefile (original)
+++ test-suite/trunk/TEST.nightly2.Makefile Thu Mar 26 17:56:02 2009
@@ -9,21 +9,27 @@
 PROGDIR := $(PROJ_SRC_ROOT)
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
-REPORTS_TO_GEN := compile nat
+REPORTS_TO_GEN := nat
+REPORT_DEPENDENCIES :=
 ifndef DISABLE_LLC
-REPORTS_TO_GEN +=  llc
+REPORTS_TO_GEN +=  llc compile
+REPORT_DEPENDENCIES += $(LLC) $(LOPT)
 endif
 ifndef DISABLE_JIT
-REPORTS_TO_GEN +=  jit
+REPORTS_TO_GEN +=  jit compile
+REPORT_DEPENDENCIES += $(LLI) $(LOPT)
 endif
 ifndef DISABLE_CBE
-REPORTS_TO_GEN +=  cbe
+REPORTS_TO_GEN +=  cbe compile
+REPORT_DEPENDENCIES += $(CBE) $(LOPT)
 endif
 ifdef ENABLE_LLCBETA
-REPORTS_TO_GEN += llc-beta
+REPORTS_TO_GEN += llc-beta compile
+REPORT_DEPENDENCIES += $(LLC) $(LOPT)
 endif
 ifdef ENABLE_OPTBETA
-REPORTS_TO_GEN += opt-beta
+REPORTS_TO_GEN += opt-beta compile
+REPORT_DEPENDENCIES += $(LOPT)
 endif
 REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN))
 
@@ -149,5 +155,3 @@
 	@echo ">>> ========= '$(RELDIR)/$*' Program"
 	@echo "---------------------------------------------------------------"
 	@-cat $<
-
-REPORT_DEPENDENCIES := $(LOPT) $(LLI) $(LLC)