aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--Makefile11
-rw-r--r--Rules11
-rwxr-xr-xscripts/merge-test-results.sh61
4 files changed, 92 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bb48f74..ae5c055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2014-03-07 Joseph Myers <joseph@codesourcery.com>
+ * scripts/merge-test-results.sh: New file.
+ * Makefile (tests-special-notdir): New variable.
+ (tests): Run merge-test-results.sh.
+ (xtests): Likewise.
+ * Rules (tests-special-notdir): New variable.
+ (xtests-special-notdir): Likewise.
+ (tests): Run merge-test-results.sh
+ (xtests): Likewise.
+
* Makeconfig (test-xfail-name): New variable.
(evaluate-test): Use $(test-xfail-name) instead of $(@F:.out=) to
compute variable name for expected failures.
diff --git a/Makefile b/Makefile
index aee88e1..8214dda 100644
--- a/Makefile
+++ b/Makefile
@@ -316,7 +316,18 @@ $(objpfx)begin-end-check.out: scripts/begin-end-check.pl
$(evaluate-test)
endif
+tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
tests: $(tests-special)
+ $(..)scripts/merge-test-results.sh -s $(objpfx) "" \
+ $(sort $(tests-special-notdir:.out=)) \
+ > $(objpfx)subdir-tests.sum
+ $(..)scripts/merge-test-results.sh -t $(objpfx) subdir-tests.sum \
+ $(sort $(subdirs) .) \
+ > $(objpfx)tests.sum
+xtests:
+ $(..)scripts/merge-test-results.sh -t $(objpfx) subdir-xtests.sum \
+ $(sort $(subdirs)) \
+ > $(objpfx)xtests.sum
# The realclean target is just like distclean for the parent, but we want
# the subdirs to know the difference in case they care.
diff --git a/Rules b/Rules
index d37ae52..feb304d 100644
--- a/Rules
+++ b/Rules
@@ -102,6 +102,17 @@ tests: $(tests:%=$(objpfx)%.out) $(tests-special)
xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
endif
+tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
+xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
+tests:
+ $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
+ $(sort $(tests) $(tests-special-notdir:.out=)) \
+ > $(objpfx)subdir-tests.sum
+xtests:
+ $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
+ $(sort $(xtests) $(xtests-special-notdir:.out=)) \
+ > $(objpfx)subdir-xtests.sum
+
ifeq ($(build-programs),yes)
binaries-all-notests = $(others) $(sysdep-others)
binaries-all-tests = $(tests) $(xtests) $(test-srcs)
diff --git a/scripts/merge-test-results.sh b/scripts/merge-test-results.sh
new file mode 100755
index 0000000..6255e24
--- /dev/null
+++ b/scripts/merge-test-results.sh
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Merge test results of individual tests or subdirectories.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+# usage: merge-test-results.sh -s objpfx subdir test-name...
+# (subdirectory tests; empty subdir at top level), or
+# merge-test-results.sh -t objpfx subdir-file-name subdir...
+# (top-level merge)
+
+set -e
+
+type=$1
+objpfx=$2
+shift 2
+
+case $type in
+ -s)
+ subdir=$1
+ shift
+ subdir=${subdir:+$subdir/}
+ for t in "$@"; do
+ if [ -s "$objpfx$t.test-result" ]; then
+ head -n1 "$objpfx$t.test-result"
+ else
+ echo "UNRESOLVED: $subdir$t"
+ fi
+ done
+ ;;
+
+ -t)
+ subdir_file_name=$1
+ shift
+ for d in "$@"; do
+ if [ -f "$objpfx$d/$subdir_file_name" ]; then
+ cat "$objpfx$d/$subdir_file_name"
+ else
+ echo "ERROR: test results for $d directory missing"
+ fi
+ done
+ ;;
+
+ *)
+ echo "unknown type $type" >&2
+ exit 1
+ ;;
+esac