[llvm-commits] CVS: reopt/test/TEST.reopt.Makefile

[Brian Gaeke]

Changes in directory reopt/test:

TEST.reopt.Makefile updated: 1.20 -> 1.21
---
Log message:

Copy the SPEC makefile rules from Makefile.spec, and use them instead of our
old horrible hack.


---
Diffs of the changes:  (+5 -2)

Index: reopt/test/TEST.reopt.Makefile
diff -u reopt/test/TEST.reopt.Makefile:1.20 reopt/test/TEST.reopt.Makefile:1.21
--- reopt/test/TEST.reopt.Makefile:1.20	Thu Aug  5 02:12:50 2004
+++ reopt/test/TEST.reopt.Makefile	Mon Aug 16 14:24:16 2004
@@ -91,8 +91,11 @@
 $(PROGRAMS_TO_TEST:%=Output/%.out-reopt-llc): \
 Output/%.out-reopt-llc: Output/%.reopt-llc
 	@echo "===== Running Reoptimizer version of $(TESTNAME) ====="
-	-cd Output/llc-train && ../../$< $(RUN_OPTIONS) < $(STDIN_FILENAME) \
-       > ../../$@
+	$(SPEC_SANDBOX) reopt-llc-$(RUN_TYPE) $@ $(REF_IN_DIR) \
+	$(RUNSAFELY) $(STDIN_FILENAME) $(STDOUT_FILENAME) \
+	../../$< $(RUN_OPTIONS)
+	-(cd Output/reopt-llc-$(RUN_TYPE); cat $(LOCAL_OUTPUTS)) > $@
+	-cp Output/reopt-llc-$(RUN_TYPE)/$(STDOUT_FILENAME).time $@.time
 else
 $(PROGRAMS_TO_TEST:%=Output/%.out-reopt-llc): \
 Output/%.out-reopt-llc: Output/%.reopt-llc