This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch roland/test-unsupported created. glibc-2.21-158-g80ed86f


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, roland/test-unsupported has been created
        at  80ed86f01c72f6b219973abf6e75551d6a479838 (commit)

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

commit 80ed86f01c72f6b219973abf6e75551d6a479838
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Mar 6 10:52:10 2015 -0800

    foo

diff --git a/ChangeLog b/ChangeLog
index b9cf458..2ad949d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-03-05  Roland McGrath  <roland@hack.frob.com>
 
+	* scripts/evaluate-test.sh: Grok exit code 77 as UNSUPPORTED and exit
+	with 0 in that case.
+	* Makefile (tests): Catch tests.sum lines that don't start with PASS:
+	or XFAIL:, rather than ones that do start with ERROR: or FAIL:.
+
 	* Makeconfig (test-wrapper-env-only): New variable.
 	* Rules (make-test-out): If variable $*-ENV-only is nonempty,
 	then use that with $(test-wrapper-env-only) rather than using
diff --git a/Makefile b/Makefile
index 17e796f..f64e5af 100644
--- a/Makefile
+++ b/Makefile
@@ -324,12 +324,10 @@ tests: $(tests-special)
 	$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-tests.sum \
 	  $(sort $(subdirs) .) \
 	  > $(objpfx)tests.sum
-	@grep '^ERROR:' $(objpfx)tests.sum || true
-	@grep '^FAIL:' $(objpfx)tests.sum || true
+	@egrep -v '^(PASS|XFAIL):' $(objpfx)tests.sum || true
 	@echo "Summary of test results:"
 	@sed 's/:.*//' < $(objpfx)tests.sum | sort | uniq -c
-	@if grep -q '^ERROR:' $(objpfx)tests.sum; then exit 1; fi
-	@if grep -q '^FAIL:' $(objpfx)tests.sum; then exit 1; fi
+	@if egrep -q -v '^(PASS|XFAIL):' $(objpfx)tests.sum; then exit 1; fi
 xtests:
 	$(..)scripts/merge-test-results.sh -t $(objpfx) subdir-xtests.sum \
 	  $(sort $(subdirs)) \
diff --git a/scripts/evaluate-test.sh b/scripts/evaluate-test.sh
index 6c002e5..ad4da6e 100755
--- a/scripts/evaluate-test.sh
+++ b/scripts/evaluate-test.sh
@@ -25,15 +25,20 @@ orig_rc=$rc
 xfail=$3
 stop_on_failure=$4
 
-if [ $rc -eq 0 ]; then
-  result="PASS"
-else
-  result="FAIL"
-fi
-
-if $xfail; then
-  result="X$result"
+if [ $rc -eq 77 ]; then
+  result="UNSUPPORTED"
   rc=0
+else
+  if [ $rc -eq 0 ]; then
+    result="PASS"
+  else
+    result="FAIL"
+  fi
+
+  if $xfail; then
+    result="X$result"
+    rc=0
+  fi
 fi
 
 echo "$result: $test_name"

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


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]