Index: TEST.pnacl.Makefile |
diff --git a/TEST.simple.Makefile b/TEST.pnacl.Makefile |
similarity index 56% |
copy from TEST.simple.Makefile |
copy to TEST.pnacl.Makefile |
index 93e3869dc1645cf16fb7980abd1c460dcf4ea0cd..4cd2d7b3a093ff7668c8d7e6a830680efbb6cf0a 100644 |
--- a/TEST.simple.Makefile |
+++ b/TEST.pnacl.Makefile |
@@ -1,7 +1,8 @@ |
-##===- TEST.simple.Makefile -------------------------------*- Makefile -*--===## |
-# |
-# This test is used in conjunction with the llvm/utils/NightlyTest* stuff to |
-# generate information about program status for the nightly report. |
+##===- TEST.pnacl.Makefile -------------------------------*- Makefile -*--===## |
+# This is mostly a copy of TEST.simple.Makefile, but using different names |
+# to avoid collisions. |
+# TODO(dschuff): fix the naming to be arch-specific so we don't have to clobber |
+# between runs. |
# |
##===----------------------------------------------------------------------===## |
@@ -12,65 +13,62 @@ RELDIR := $(subst $(PROGDIR),,$(CURDIR)) |
REPORTS_TO_GEN := compile exec |
REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN)) |
-#$(PROGRAMS_TO_TEST:%=Output/%.simple.compile.report.txt): \ |
-#Output/%.simple.compile.report.txt: Output/%.out-simple |
+# Yes, this commented-out code is present in TEST.simple.Makefile |
+#$(PROGRAMS_TO_TEST:%=Output/%.pnacl.compile.report.txt): \ |
+#Output/%.pnacl.compile.report.txt: Output/%.out-pnacl |
# @echo > $@ |
# @printf "TEST-RESULT-compile-time: " >> $@ |
-# -grep "^program" Output/$*.simple.compile.time >> $@ |
+# -grep "^program" Output/$*.pnacl.compile.time >> $@ |
-$(PROGRAMS_TO_TEST:%=Output/%.simple.compile.report.txt): \ |
-Output/%.simple.compile.report.txt: Output/%.out-simple |
+$(PROGRAMS_TO_TEST:%=Output/%.pnacl.compile.report.txt): \ |
+Output/%.pnacl.compile.report.txt: Output/%.out-pnacl |
@echo > $@ |
- @-if test -f Output/$*.simple; then \ |
+ @-if test -f Output/$*.nexe; then \ |
echo "TEST-PASS: compile $(RELDIR)/$*" >> $@; \ |
echo "TEST-RESULT-compile-success: pass" >> $@;\ |
else \ |
echo "TEST-FAIL: compile $(RELDIR)/$*" >> $@; \ |
fi |
@-printf "TEST-RESULT-compile-time: " >> $@ |
- @-grep "^user" Output/$*.simple.compile.time >> $@ |
- @-printf "TEST-RESULT-compile-real-time: " >> $@ |
- @-grep "^real" Output/$*.simple.compile.time >> $@ |
+ @-grep "^program" Output/$*.pnacl.compile.time >> $@ |
-$(PROGRAMS_TO_TEST:%=Output/%.simple.exec.report.txt): \ |
-Output/%.simple.exec.report.txt: Output/%.exe-simple |
+$(PROGRAMS_TO_TEST:%=Output/%.pnacl.exec.report.txt): \ |
+Output/%.pnacl.exec.report.txt: Output/%.exe-pnacl |
@echo > $@ |
@-is_xfail=0; \ |
for i in $(EXEC_XFAILS); do \ |
- if test "$*" = $$i; then \ |
+ if test "$*" == $$i; then \ |
is_xfail=1; \ |
fi; \ |
done; \ |
- if test $$is_xfail -eq 1; then \ |
+ if test $$is_xfail == 1; then \ |
echo "TEST-XFAIL: exec $(RELDIR)/$*" >> $@;\ |
echo "TEST-RESULT-exec-success: xfail" >> $@;\ |
- elif test -f Output/$*.exe-simple; then \ |
+ elif test -f Output/$*.exe-pnacl; then \ |
echo "TEST-PASS: exec $(RELDIR)/$*" >> $@;\ |
echo "TEST-RESULT-exec-success: pass" >> $@;\ |
else \ |
echo "TEST-FAIL: exec $(RELDIR)/$*" >> $@;\ |
fi |
@-printf "TEST-RESULT-exec-time: " >> $@ |
- @-grep "^user" Output/$*.out-simple.time >> $@ |
- @-printf "TEST-RESULT-exec-real-time: " >> $@ |
- @-grep "^real" Output/$*.out-simple.time >> $@ |
+ @-grep "^program" Output/$*.out-pnacl.time >> $@ |
if test -f Output/$*.extra-results.txt; then \ |
$(PROGDIR)/ParseMultipleResults $(RELDIR)/$* Output/$*.extra-results.txt >> $@; \ |
fi |
# Overall tests: just run subordinate tests |
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ |
-Output/%.$(TEST).report.txt: $(addprefix Output/%.simple., $(REPORTS_SUFFIX)) |
+Output/%.$(TEST).report.txt: $(addprefix Output/%.pnacl., $(REPORTS_SUFFIX)) |
$(VERB) $(RM) -f $@ |
@echo "---------------------------------------------------------------" >> $@ |
@echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ |
@echo "---------------------------------------------------------------" >> $@ |
- -cat $(addprefix Output/$*.simple., $(REPORTS_SUFFIX)) >> $@ |
+ -cat $(addprefix Output/$*.pnacl., $(REPORTS_SUFFIX)) >> $@ |
$(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ |
test.$(TEST).%: Output/%.$(TEST).report.txt |
@-cat $< |
$(PROGRAMS_TO_TEST:%=build.$(TEST).%): \ |
-build.$(TEST).%: Output/%.simple |
+build.$(TEST).%: Output/%.nexe |
@echo "Finished Building: $<" |