From f8c17e79fab13a3d1de976c1c3564df7f8c2a175 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 27 Feb 2014 03:25:27 +0000 Subject: Support expected failures in .test-result files. This patch, an updated version of , 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. --- conform/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conform') 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) -- cgit 1.4.1