[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Solaris make testsuite fixes.
From: |
Ralf Wildenhues |
Subject: |
Solaris make testsuite fixes. |
Date: |
Sat, 7 Mar 2009 07:48:27 +0100 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
Some test fallout, pushed to both branches as applicable.
The ChangeLog entry explains the details.
Cheers,
Ralf
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.
diff --git a/tests/check10.test b/tests/check10.test
index 138331c..d0f1b60 100755
--- 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 5f66a12..31ffec8 100755
--- 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 23a7e64..b7d8442 100755
--- 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Solaris make testsuite fixes.,
Ralf Wildenhues <=