Fix a couple of $(EXEEXT)-related testsuite failure.

* tests/check8.test: Allow executable extensions in test suite
output.
* tests/check9.test: Add `$(EXEEXT)' manually to @substituted@
XFAIL_TESTS entries.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 7c76c34..948ed58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix a couple of $(EXEEXT)-related testsuite failure.
+       * tests/check8.test: Allow executable extensions in test suite
+       output.
+       * tests/check9.test: Add `$(EXEEXT)' manually to @substituted@
+       XFAIL_TESTS entries.
+
        * NEWS: Update for last patch.
 
 2009-04-07  Florian Briegel  <briegel@zone42.de>  (tiny change)

diff --git a/tests/check8.test b/tests/check8.test
index 3e38ccf..1fe2a53 100755 (executable)
--- a/tests/check8.test
+++ b/tests/check8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -73,10 +73,10 @@ cat stdout
 cat stderr >&2
 grep 'XPASS.* foo$' stdout
 grep '^[^X]*PASS.* sub/foo$' stdout
-grep '^[^X]*PASS.* bar$' stdout
-grep '^[^X]*PASS.* sub/bar$' stdout
-grep '^[^X]*FAIL.* baz$' stdout
-grep 'XFAIL.* sub/baz$' stdout
+grep '^[^X]*PASS.* bar' stdout
+grep '^[^X]*PASS.* sub/bar' stdout
+grep '^[^X]*FAIL.* baz' stdout
+grep 'XFAIL.* sub/baz' stdout
 # parallel-tests should not add circular dependencies.
 # Look for known warnings from a couple of `make' implementations.
 grep -i 'circular.*dependency' stderr && Exit 1
@@ -93,8 +93,8 @@ cat stdout
 # rewriting (if we fix that, we can still write a separate test for it).
 grep 'XPASS.*foo$' stdout
 grep '^[^X]*PASS.*sub/foo$' stdout
-grep '^[^X]*PASS.*bar$' stdout
-grep '^[^X]*PASS.*sub/bar$' stdout
-grep '^[^X]*FAIL.*baz$' stdout
-grep 'XFAIL.*sub/baz$' stdout
+grep '^[^X]*PASS.*bar' stdout
+grep '^[^X]*PASS.*sub/bar' stdout
+grep '^[^X]*FAIL.*baz' stdout
+grep 'XFAIL.*sub/baz' stdout
 :

diff --git a/tests/check9.test b/tests/check9.test
index 91c37c5..658e636 100755 (executable)
--- a/tests/check9.test
+++ b/tests/check9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ cat >> configure.in << 'END'
 AC_PROG_CC
 AC_SUBST([script_tests], ['subst-pass-script.test subst-xfail-script.test'])
 AC_SUBST([prog_tests], ['subst-pass-prog.test$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
-AC_SUBST([xfail_tests], ['xfail-script.test subst-xfail-script.test xfail-prog subst-xfail-prog.test$(EXEEXT)'])
+AC_SUBST([xfail_tests], ['xfail-script.test subst-xfail-script.test xfail-prog$(EXEEXT) subst-xfail-prog.test$(EXEEXT)'])
 AC_OUTPUT
 END