| OLD | NEW |
| 1 ##===- TEST.simple.Makefile -------------------------------*- Makefile -*--===## | 1 ##===- TEST.pnacl.Makefile -------------------------------*- Makefile -*--===## |
| 2 # | 2 # This is mostly a copy of TEST.simple.Makefile, but using different names |
| 3 # This test is used in conjunction with the llvm/utils/NightlyTest* stuff to | 3 # to avoid collisions. |
| 4 # generate information about program status for the nightly report. | 4 # TODO(dschuff): fix the naming to be arch-specific so we don't have to clobber |
| 5 # between runs. |
| 5 # | 6 # |
| 6 ##===----------------------------------------------------------------------===## | 7 ##===----------------------------------------------------------------------===## |
| 7 | 8 |
| 8 CURDIR := $(shell cd .; pwd) | 9 CURDIR := $(shell cd .; pwd) |
| 9 PROGDIR := $(PROJ_SRC_ROOT) | 10 PROGDIR := $(PROJ_SRC_ROOT) |
| 10 RELDIR := $(subst $(PROGDIR),,$(CURDIR)) | 11 RELDIR := $(subst $(PROGDIR),,$(CURDIR)) |
| 11 | 12 |
| 12 REPORTS_TO_GEN := compile exec | 13 REPORTS_TO_GEN := compile exec |
| 13 REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN)) | 14 REPORTS_SUFFIX := $(addsuffix .report.txt, $(REPORTS_TO_GEN)) |
| 14 | 15 |
| 15 #$(PROGRAMS_TO_TEST:%=Output/%.simple.compile.report.txt): \ | 16 # Yes, this commented-out code is present in TEST.simple.Makefile |
| 16 #Output/%.simple.compile.report.txt: Output/%.out-simple | 17 #$(PROGRAMS_TO_TEST:%=Output/%.pnacl.compile.report.txt): \ |
| 18 #Output/%.pnacl.compile.report.txt: Output/%.out-pnacl |
| 17 # @echo > $@ | 19 # @echo > $@ |
| 18 # @printf "TEST-RESULT-compile-time: " >> $@ | 20 # @printf "TEST-RESULT-compile-time: " >> $@ |
| 19 #» -grep "^program" Output/$*.simple.compile.time >> $@ | 21 #» -grep "^program" Output/$*.pnacl.compile.time >> $@ |
| 20 | 22 |
| 21 $(PROGRAMS_TO_TEST:%=Output/%.simple.compile.report.txt): \ | 23 $(PROGRAMS_TO_TEST:%=Output/%.pnacl.compile.report.txt): \ |
| 22 Output/%.simple.compile.report.txt: Output/%.out-simple | 24 Output/%.pnacl.compile.report.txt: Output/%.out-pnacl |
| 23 @echo > $@ | 25 @echo > $@ |
| 24 » @-if test -f Output/$*.simple; then \ | 26 » @-if test -f Output/$*.nexe; then \ |
| 25 echo "TEST-PASS: compile $(RELDIR)/$*" >> $@; \ | 27 echo "TEST-PASS: compile $(RELDIR)/$*" >> $@; \ |
| 26 echo "TEST-RESULT-compile-success: pass" >> $@;\ | 28 echo "TEST-RESULT-compile-success: pass" >> $@;\ |
| 27 else \ | 29 else \ |
| 28 echo "TEST-FAIL: compile $(RELDIR)/$*" >> $@; \ | 30 echo "TEST-FAIL: compile $(RELDIR)/$*" >> $@; \ |
| 29 fi | 31 fi |
| 30 @-printf "TEST-RESULT-compile-time: " >> $@ | 32 @-printf "TEST-RESULT-compile-time: " >> $@ |
| 31 » @-grep "^user" Output/$*.simple.compile.time >> $@ | 33 » @-grep "^program" Output/$*.pnacl.compile.time >> $@ |
| 32 » @-printf "TEST-RESULT-compile-real-time: " >> $@ | |
| 33 » @-grep "^real" Output/$*.simple.compile.time >> $@ | |
| 34 | 34 |
| 35 $(PROGRAMS_TO_TEST:%=Output/%.simple.exec.report.txt): \ | 35 $(PROGRAMS_TO_TEST:%=Output/%.pnacl.exec.report.txt): \ |
| 36 Output/%.simple.exec.report.txt: Output/%.exe-simple | 36 Output/%.pnacl.exec.report.txt: Output/%.exe-pnacl |
| 37 @echo > $@ | 37 @echo > $@ |
| 38 @-is_xfail=0; \ | 38 @-is_xfail=0; \ |
| 39 for i in $(EXEC_XFAILS); do \ | 39 for i in $(EXEC_XFAILS); do \ |
| 40 » if test "$*" = $$i; then \ | 40 » if test "$*" == $$i; then \ |
| 41 is_xfail=1; \ | 41 is_xfail=1; \ |
| 42 fi; \ | 42 fi; \ |
| 43 done; \ | 43 done; \ |
| 44 » if test $$is_xfail -eq 1; then \ | 44 » if test $$is_xfail == 1; then \ |
| 45 echo "TEST-XFAIL: exec $(RELDIR)/$*" >> $@;\ | 45 echo "TEST-XFAIL: exec $(RELDIR)/$*" >> $@;\ |
| 46 echo "TEST-RESULT-exec-success: xfail" >> $@;\ | 46 echo "TEST-RESULT-exec-success: xfail" >> $@;\ |
| 47 » elif test -f Output/$*.exe-simple; then \ | 47 » elif test -f Output/$*.exe-pnacl; then \ |
| 48 echo "TEST-PASS: exec $(RELDIR)/$*" >> $@;\ | 48 echo "TEST-PASS: exec $(RELDIR)/$*" >> $@;\ |
| 49 echo "TEST-RESULT-exec-success: pass" >> $@;\ | 49 echo "TEST-RESULT-exec-success: pass" >> $@;\ |
| 50 else \ | 50 else \ |
| 51 echo "TEST-FAIL: exec $(RELDIR)/$*" >> $@;\ | 51 echo "TEST-FAIL: exec $(RELDIR)/$*" >> $@;\ |
| 52 fi | 52 fi |
| 53 @-printf "TEST-RESULT-exec-time: " >> $@ | 53 @-printf "TEST-RESULT-exec-time: " >> $@ |
| 54 » @-grep "^user" Output/$*.out-simple.time >> $@ | 54 » @-grep "^program" Output/$*.out-pnacl.time >> $@ |
| 55 » @-printf "TEST-RESULT-exec-real-time: " >> $@ | |
| 56 » @-grep "^real" Output/$*.out-simple.time >> $@ | |
| 57 if test -f Output/$*.extra-results.txt; then \ | 55 if test -f Output/$*.extra-results.txt; then \ |
| 58 $(PROGDIR)/ParseMultipleResults $(RELDIR)/$* Output/$*.extra-results.t
xt >> $@; \ | 56 $(PROGDIR)/ParseMultipleResults $(RELDIR)/$* Output/$*.extra-results.t
xt >> $@; \ |
| 59 fi | 57 fi |
| 60 | 58 |
| 61 # Overall tests: just run subordinate tests | 59 # Overall tests: just run subordinate tests |
| 62 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ | 60 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \ |
| 63 Output/%.$(TEST).report.txt: $(addprefix Output/%.simple., $(REPORTS_SUFFIX)) | 61 Output/%.$(TEST).report.txt: $(addprefix Output/%.pnacl., $(REPORTS_SUFFIX)) |
| 64 $(VERB) $(RM) -f $@ | 62 $(VERB) $(RM) -f $@ |
| 65 @echo "---------------------------------------------------------------"
>> $@ | 63 @echo "---------------------------------------------------------------"
>> $@ |
| 66 @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ | 64 @echo ">>> ========= '$(RELDIR)/$*' Program" >> $@ |
| 67 @echo "---------------------------------------------------------------"
>> $@ | 65 @echo "---------------------------------------------------------------"
>> $@ |
| 68 » -cat $(addprefix Output/$*.simple., $(REPORTS_SUFFIX)) >> $@ | 66 » -cat $(addprefix Output/$*.pnacl., $(REPORTS_SUFFIX)) >> $@ |
| 69 | 67 |
| 70 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ | 68 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \ |
| 71 test.$(TEST).%: Output/%.$(TEST).report.txt | 69 test.$(TEST).%: Output/%.$(TEST).report.txt |
| 72 @-cat $< | 70 @-cat $< |
| 73 | 71 |
| 74 $(PROGRAMS_TO_TEST:%=build.$(TEST).%): \ | 72 $(PROGRAMS_TO_TEST:%=build.$(TEST).%): \ |
| 75 build.$(TEST).%: Output/%.simple | 73 build.$(TEST).%: Output/%.nexe |
| 76 @echo "Finished Building: $<" | 74 @echo "Finished Building: $<" |
| OLD | NEW |