[llvm-commits] [test-suite] r105208 - in /test-suite/trunk: TEST.simple.Makefile TEST.simple.report

[Daniel Dunbar]

Author: ddunbar
Date: Mon May 31 01:16:41 2010
New Revision: 105208

URL: http://llvm.org/viewvc/llvm-project?rev=105208&view=rev
Log:
Add TEST=simple support for marking tests as XFAIL.

Modified:
    test-suite/trunk/TEST.simple.Makefile
    test-suite/trunk/TEST.simple.report

Modified: test-suite/trunk/TEST.simple.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.simple.Makefile?rev=105208&r1=105207&r2=105208&view=diff
==============================================================================
--- test-suite/trunk/TEST.simple.Makefile (original)
+++ test-suite/trunk/TEST.simple.Makefile Mon May 31 01:16:41 2010
@@ -33,8 +33,16 @@
 $(PROGRAMS_TO_TEST:%=Output/%.simple.exec.report.txt): \
 Output/%.simple.exec.report.txt: Output/%.exe-simple
 	@echo > $@
-	@-if test -f Output/$*.exe-simple; then \
-	  head -n 100 Output/$*.exe-simple >> $@; \
+	@-is_xfail=0; \
+	for i in $(EXEC_XFAILS); do \
+	   if test "$*" == $$i; then \
+	     is_xfail=1; \
+	   fi; \
+	done; \
+	if test $$is_xfail == 1; then \
+	  echo "TEST-XFAIL: exec $(RELDIR)/$*" >> $@;\
+	  echo "TEST-RESULT-exec-success: xfail" >> $@;\
+	elif test -f Output/$*.exe-simple; then \
 	  echo "TEST-PASS: exec $(RELDIR)/$*" >> $@;\
 	  echo "TEST-RESULT-exec-success: pass" >> $@;\
 	else  \

Modified: test-suite/trunk/TEST.simple.report
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.simple.report?rev=105208&r1=105207&r2=105208&view=diff
==============================================================================
--- test-suite/trunk/TEST.simple.report (original)
+++ test-suite/trunk/TEST.simple.report Mon May 31 01:16:41 2010
@@ -23,8 +23,8 @@
 (
  ["Program"  , '\'([^\']+)\' Program'],
  [],
- ["CC"       , 'TEST-RESULT-compile-success: (pass)'],
+ ["CC"       , 'TEST-RESULT-compile-success: (pass|fail|xfail)'],
  ["CC_Time"  , 'TEST-RESULT-compile-time: program\s*([.0-9m:]+)', \&FormatTime],
- ["Exec"     , 'TEST-RESULT-exec-success: (pass)'],
+ ["Exec"     , 'TEST-RESULT-exec-success: (pass|fail|xfail)'],
  ["Exec_Time", 'TEST-RESULT-exec-time: program\s*([.0-9m:]+)', \&FormatTime],
 );