about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bb48f748b5..ae5c05592a 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.