GNU C Library master sources branch master updated. glibc-2.19-88-gf8c17e7

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f8c17e79fab13a3d1de976c1c3564df7f8c2a175 (commit)
      from  a5f891ac8df09e56ecc64bf18a839a06470deacd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f8c17e79fab13a3d1de976c1c3564df7f8c2a175

commit f8c17e79fab13a3d1de976c1c3564df7f8c2a175
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Thu Feb 27 03:25:27 2014 +0000

    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.

diff --git a/ChangeLog b/ChangeLog
index 4ef5ccc..7a64c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-02-27  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2014-02-26  Joseph Myers  <joseph@codesourcery.com>
 
 	* argp/Makefile: Include Makeconfig immediately after defining
diff --git a/Makeconfig b/Makeconfig
index 21a7d6e..3709c88 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1083,8 +1083,11 @@ endif
 # The name to give to a test in test results summaries.
 test-name = $(strip $(patsubst %.out, %, $(patsubst $(common-objpfx)%, %, $@)))
 
-# Command to output a test status line (such as PASS: test-name).
+# Command to output a test status line (such as PASS: test-name).  If
+# test-xfail-$(@F:.out=) has a nonempty value, the status will be
+# XPASS or XFAIL rather than PASS or FAIL.
 evaluate-test = $(..)scripts/evaluate-test.sh $(test-name) $$? \
+		  $(if $(test-xfail-$(@F:.out=)),true,false) \
 		  > $(common-objpfx)$(test-name).test-result
 
 endif # Makeconfig not yet included
diff --git a/conform/Makefile b/conform/Makefile
index 41f0bb3..40081f3 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)
 
diff --git a/posix/Makefile b/posix/Makefile
index 304238f..b41055a 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -233,8 +233,9 @@ tests: $(objpfx)bug-regex2-mem $(objpfx)bug-regex14-mem \
 xtests: $(objpfx)bug-ga2-mem
 endif
 
+test-xfail-annexc = yes
 $(objpfx)annexc.out: $(objpfx)annexc
-	-$(dir $<)$(notdir $<) '$(CC)' \
+	$(dir $<)$(notdir $<) '$(CC)' \
 	  '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include $(+sysdep-includes) $(sysincludes) -I..' > $@; \
 	$(evaluate-test)
 
diff --git a/scripts/evaluate-test.sh b/scripts/evaluate-test.sh
index 9cb6435..c8f5012 100755
--- a/scripts/evaluate-test.sh
+++ b/scripts/evaluate-test.sh
@@ -17,10 +17,12 @@
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
-# usage: evaluate-test.sh test_name rc
+# usage: evaluate-test.sh test_name rc xfail
 
 test_name=$1
 rc=$2
+orig_rc=$rc
+xfail=$3
 
 if [ $rc -eq 0 ]; then
   result="PASS"
@@ -28,6 +30,11 @@ else
   result="FAIL"
 fi
 
+if $xfail; then
+  result="X$result"
+  rc=0
+fi
+
 echo "$result: $test_name"
-echo "original exit status $rc"
+echo "original exit status $orig_rc"
 exit $rc

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |   12 ++++++++++++
 Makeconfig               |    5 ++++-
 conform/Makefile         |    3 ++-
 posix/Makefile           |    3 ++-
 scripts/evaluate-test.sh |   11 +++++++++--
 5 files changed, 29 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources