[llvm-commits] [test-suite] r153352 - in /test-suite/trunk/MultiSource: Applications/sqlite3/Makefile Makefile.multisrc
Daniel Dunbar
daniel at zuster.org
Fri Mar 23 16:20:54 PDT 2012
Author: ddunbar
Date: Fri Mar 23 18:20:54 2012
New Revision: 153352
URL: http://llvm.org/viewvc/llvm-project?rev=153352&view=rev
Log:
MultiSource/Applications/sqlite3: Clean up rules to generate the test input
files to not be bogus, this seems to break this test on gmake 3.82 (which is
completely fair).
Modified:
test-suite/trunk/MultiSource/Applications/sqlite3/Makefile
test-suite/trunk/MultiSource/Makefile.multisrc
Modified: test-suite/trunk/MultiSource/Applications/sqlite3/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/sqlite3/Makefile?rev=153352&r1=153351&r2=153352&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/sqlite3/Makefile (original)
+++ test-suite/trunk/MultiSource/Applications/sqlite3/Makefile Fri Mar 23 18:20:54 2012
@@ -11,17 +11,17 @@
include $(LEVEL)/Makefile.config
-include ../../Makefile.multisrc
+GeneratedTestInputs := $(PROJ_OBJ_DIR)/test15.sql
-# the input files are generated from a tcl script
-# it needs to be generated before sqlite is run
-sqlite3.c: $(PROJ_SRC_DIR)/test15.sql
+include ../../Makefile.multisrc
+# The input files are generated from a tcl script and need to be generated
+# before sqlite is run.
ifdef SMALL_PROBLEM_SIZE
-$(PROJ_SRC_DIR)/test15.sql: $(PROJ_SRC_DIR)/smalltest.tcl
+$(PROJ_OBJ_DIR)/test15.sql: $(PROJ_SRC_DIR)/smalltest.tcl
$(TCLSH) $(PROJ_SRC_DIR)/smalltest.tcl
else
-$(PROJ_SRC_DIR)/test15.sql: $(PROJ_SRC_DIR)/speedtest.tcl
+$(PROJ_OBJ_DIR)/test15.sql: $(PROJ_SRC_DIR)/speedtest.tcl
$(TCLSH) $(PROJ_SRC_DIR)/speedtest.tcl
endif
Modified: test-suite/trunk/MultiSource/Makefile.multisrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=153352&r1=153351&r2=153352&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Makefile.multisrc (original)
+++ test-suite/trunk/MultiSource/Makefile.multisrc Fri Mar 23 18:20:54 2012
@@ -84,15 +84,15 @@
endif
-Output/%.simple: $(NLObjects)
+Output/%.simple: $(NLObjects) $(GeneratedTestInputs)
@-cat $(NLObjects:%=%.compile.time) | awk -- '\
BEGIN { sum = 0.0; }\
/^program/ { sum += $$2; }\
!/^program/ { print; }\
END { printf("program %f\n", sum); }' > $@.compile.time
- -$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
+ -$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $(NLObjects) $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
-Output/%.native: $(NObjects)
+Output/%.native: $(NObjects) $(GeneratedTestInputs)
-$(CXX) -o $@ $(NObjects) $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
# A simple target to run findmisopt when bugpoint isn't helping
More information about the llvm-commits
mailing list