summaryrefslogtreecommitdiff
path: root/conform
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-02-27 03:25:27 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-02-27 03:25:27 +0000
commitf8c17e79fab13a3d1de976c1c3564df7f8c2a175 (patch)
tree3192a7221761cb0a42279698044f338c961ccc1e /conform
parenta5f891ac8df09e56ecc64bf18a839a06470deacd (diff)
Support expected failures in .test-result files.
This patch, an updated version of <https://sourceware.org/ml/libc-alpha/2014-01/msg00195.html>, makes it possible for .test-result files for individual tests to contain XPASS and XFAIL rather than PASS and FAIL in cases where failure is expected. This replaces the marking of two individual tests with "-" to cause them to be expected at makefile level to fail; evaluate-test.sh will ensure it exits with status 0 for an expected failure. Tested x86_64. * scripts/evaluate-test.sh: Take new argument indicating whether failure is expected. * Makeconfig (evaluate-test): Pass argument to evaluate-test.sh indicating whether failure is expected. * conform/Makefile (test-xfail-run-conformtest): New variable. ($(objpfx)run-conformtest.out): Don't expect to fail at makefile level. * posix/Makefile (test-xfail-annexc): New variable. ($(objpfx)annexc.out): Don't expect to fail at makefile level.
Diffstat (limited to 'conform')
-rw-r--r--conform/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/conform/Makefile b/conform/Makefile
index 41f0bb3f57..40081f304b 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -30,10 +30,11 @@ tests: $(objpfx)run-conformtest.out
endif
endif
+test-xfail-run-conformtest = yes
$(objpfx)run-conformtest.out: run-conformtest.sh conformtest.pl \
$(wildcard data/*.h-data) \
$(wildcard data/*/*.h-data)
- -$(BASH) -e $< $(objpfx) $(PERL) '$(CC)' \
+ $(BASH) -e $< $(objpfx) $(PERL) '$(CC)' \
'-I../include $(+sysdep-includes) $(sysincludes) -I..'; \
$(evaluate-test)