Solaris make testsuite fixes.

* tests/check10.test: When a rule fails, Solaris make will
output the complete command that failed; in this case the test
suite driver.  Adjust the test to not bogusly match lines from
the driver, rather than its output.
* tests/distcleancheck.test: Avoid triggering VPATH rewriting,
not desirable in this test.
* tests/specflg10.test: Use BUILT_SOURCES to specify an
intermediate target, so Solaris make knows what to do.

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

diff --git a/ChangeLog b/ChangeLog
index 658832fd734cebc866acaec4f47c853899e88793..36250205e0ef93eb06d08513d5aabf86b70fe2a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-03-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Solaris make testsuite fixes.
+       * tests/check10.test: When a rule fails, Solaris make will
+       output the complete command that failed; in this case the test
+       suite driver.  Adjust the test to not bogusly match lines from
+       the driver, rather than its output.
+       * tests/distcleancheck.test: Avoid triggering VPATH rewriting,
+       not desirable in this test.
+       * tests/specflg10.test: Use BUILT_SOURCES to specify an
+       intermediate target, so Solaris make knows what to do.
+
        testsuite: SKIP compile tests if configure found no compiler.
        * tests/depend6.test: configure will exit 77 if AC_PROG_CC found
        no working compiler.  Allow the test to be SKIPped in that case.

diff --git a/tests/check10.test b/tests/check10.test
index 138331cfd227cb214f3a60ae2a1fd438b15325f7..d0f1b601f35f4915571892cf6a585998f6c43d28 100755 (executable)
--- a/tests/check10.test
+++ b/tests/check10.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
@@ -77,11 +77,10 @@ unset TESTS || :
 cat stdout
 
 grep '1 [tT]ests' stdout && Exit 1
-grep '^[^1]* [tT]est ' stdout && Exit 1
+grep '[02-9] [tT]est ' stdout && Exit 1
 grep '1 .* were ' stdout && Exit 1
-grep '^[^1]* was' stdout && Exit 1
+grep '[02-9].* was .*run' stdout && Exit 1
 grep 'All 1 ' stdout && Exit 1
-grep '^ .*[tT]est' stdout && Exit 1
 $EGREP '1 (un)?expected (failures|passes)' stdout && Exit 1
 $EGREP '[^1] (un)?expected (failure|pass)\)' stdout && Exit 1
 

diff --git a/tests/distcleancheck.test b/tests/distcleancheck.test
index 5f66a12680e7146fc966aabd5123b89fc969c474..31ffec8727deb2a681f72f85221a6ea9a6d08c2e 100755 (executable)
--- a/tests/distcleancheck.test
+++ b/tests/distcleancheck.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
@@ -33,8 +33,10 @@ bin_PROGRAMS = foo
 foo_SOURCES = foo.c
 dist_man_MANS = foo.1
 
+# We write `./foo.1' inside the rule on purpose, to avoid VPATH rewriting
+# done by some `make' implementations.
 foo.1: foo$(EXEEXT)
-       echo man page for foo$(EXEEXT) > foo.1
+       echo man page for foo$(EXEEXT) > ./foo.1
 
 ## Ignore warnings about overridden variables
 AUTOMAKE_OPTIONS = -Wno-override

diff --git a/tests/specflg10.test b/tests/specflg10.test
index 23a7e6469c8eebf4d0da16360f323b54ddfa3a16..b7d8442dbc87d475659c003c526994e5a3ab0cc8 100755 (executable)
--- a/tests/specflg10.test
+++ b/tests/specflg10.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
@@ -48,6 +48,7 @@ endif
 SUFFIXES = .foo .c
 .foo.c:
        cat $< >$@
+BUILT_SOURCES = bla.c
 CLEANFILES = bla.c
 END