Changes in directory llvm-test:
Makefile.programs updated: 1.243 -> 1.244
RunSafely.sh updated: 1.22 -> 1.23
---
Log message:
Move an error message out of multiple locations in the Makefile and into
one location in RunSafely.sh. Also, if exit code checking has been enabled,
emit the exit code to the end of the output file so that any differences
in exit code will also show up as a failure.
---
Diffs of the changes: (+6 -21)
Makefile.programs | 21 ---------------------
RunSafely.sh | 6 ++++++
2 files changed, 6 insertions(+), 21 deletions(-)
Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.243 llvm-test/Makefile.programs:1.244
--- llvm-test/Makefile.programs:1.243 Sat Nov 25 02:56:10 2006
+++ llvm-test/Makefile.programs Sun Nov 26 01:14:16 2006
@@ -356,52 +356,31 @@
$(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
Output/%.out-nat: Output/%.native
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (nat): $* FAILED EXITOK!"; rm -f $@; \
- fi
endif
$(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
Output/%.out-lli: Output/%.llvm.bc $(LLI)
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLI_OPTS) $< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (lli): $* FAILED EXITOK!"; rm -f $@; \
- fi
$(PROGRAMS_TO_TEST:%=Output/%.out-jit): \
Output/%.out-jit: Output/%.llvm.bc $(LLI)
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(JIT_OPTS) $< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (jit): $* FAILED EXITOK!"; rm -f $@; \
- fi
$(PROGRAMS_TO_TEST:%=Output/%.out-jit-beta): \
Output/%.out-jit-beta: Output/%.llvm.bc $(LLI)
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $(LLI) $(LLCBETAOPTION) $(JIT_OPTS)
$< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (jit-beta): $* FAILED EXITOK!"; rm -f $@; \
- fi
$(PROGRAMS_TO_TEST:%=Output/%.out-llc): \
Output/%.out-llc: Output/%.llc
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (llc): $* FAILED EXITOK!" ; rm -f $@; \
- fi
$(PROGRAMS_TO_TEST:%=Output/%.out-llc-beta): \
Output/%.out-llc-beta: Output/%.llc-beta
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (llc-beta): $* FAILED EXITOK!" ; rm -f $@; \
- fi
$(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
Output/%.out-cbe: Output/%.cbe
-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
- @if test $$? -ne 0 ; then \
- echo "TEST (cbe): $* FAILED EXITOK!" ; rm -f $@; \
- fi
# If a tolerance is set, pass it off to bugpoint
ifdef FP_TOLERANCE
Index: llvm-test/RunSafely.sh
diff -u llvm-test/RunSafely.sh:1.22 llvm-test/RunSafely.sh:1.23
--- llvm-test/RunSafely.sh:1.22 Sat Nov 25 02:56:10 2006
+++ llvm-test/RunSafely.sh Sun Nov 26 01:14:16 2006
@@ -92,7 +92,13 @@
exitval=`grep '^exit ' $OUTFILE.time | sed -e 's/^exit //'`
if [ -z "$exitval" ] ; then
exitval=99
+ echo "TEST $PROGRAM FAILED: CAN'T GET EXIT CODE!"
+ else
+ if test "$exitval" -ne 0 ; then
+ echo "TEST $PROGRAM FAILED: EXIT != 0"
+ fi
fi
+ echo "exit $exitval" >> $OUTFILE
else
exitval=0
fi
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
