[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10
From: |
Ralf Wildenhues |
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-38-g2251610 |
Date: |
Sat, 07 Mar 2009 06:48:25 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=22516106489396ba296aa5c77bafb9e38834799f
The branch, branch-1-10 has been updated
via 22516106489396ba296aa5c77bafb9e38834799f (commit)
from 632678196866ac579fb061fa8b00b21d64a8fc1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 22516106489396ba296aa5c77bafb9e38834799f
Author: Ralf Wildenhues <address@hidden>
Date: Sat Mar 7 07:40:06 2009 +0100
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.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
tests/check10.test | 17 ++++++++---------
tests/distcleancheck.test | 6 ++++--
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b92ebd4..827ac1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-03-07 Ralf Wildenhues <address@hidden>
+ 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.
+
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 1689255..9ba8823 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
@@ -76,13 +76,12 @@ unset TESTS || :
) >stdout
cat stdout
-grep '1 [tT]ests' stdout && exit 1
-grep '^[^1]* [tT]est ' stdout && exit 1
-grep '1 .* were ' stdout && exit 1
-grep '^[^1]* was' 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
+grep '1 [tT]ests' stdout && Exit 1
+grep '[02-9] [tT]est ' stdout && Exit 1
+grep '1 .* were ' stdout && Exit 1
+grep '[02-9].* was .*run' stdout && Exit 1
+grep 'All 1 ' 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
hooks/post-receive
--
GNU Automake
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. v1.10.2-38-g2251610,
Ralf Wildenhues <=