automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] tests: fix aclocal-print-acdir.test


From: Jim Meyering
Subject: [PATCH] tests: fix aclocal-print-acdir.test
Date: Thu, 20 Oct 2011 18:01:43 +0200

Without the patch below, I would consistently see this failure:

    FAIL: aclocal-print-acdir.test (exit: 1)
    ========================================
    + set -e
    ...
    ++ aclocal-1.11a -Werror --print-ac-dir
    + test /h/j/w/co/automake/m4/acdir = /h/j/w/co/automake/m4
    + exit_status=1
    + set +e
    ...

I haven't delved into it to see how this test could be succeeding for
anyone else, so the patch may well be wrong.

>From 367df29afd3c875da003fb1cd927e3b2f8ae2197 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Thu, 20 Oct 2011 17:57:55 +0200
Subject: [PATCH] tests: fix aclocal-print-acdir.test

* tests/aclocal-print-acdir.test: Adjust to pass.
---
 ChangeLog                      |    5 +++++
 tests/aclocal-print-acdir.test |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c762410..fcf64d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-20  Jim Meyering  <address@hidden>
+
+       tests: fix aclocal-print-acdir.test
+       * tests/aclocal-print-acdir.test: Adjust to pass.
+
 2011-10-19  Stefano Lattarini  <address@hidden>

        tests: avoid spurious failure of 'uninstall-fail.test' on Cygwin
diff --git a/tests/aclocal-print-acdir.test b/tests/aclocal-print-acdir.test
index add1f64..420b551 100755
--- a/tests/aclocal-print-acdir.test
+++ b/tests/aclocal-print-acdir.test
@@ -21,7 +21,7 @@
 set -e

 $ACLOCAL --print-ac-dir
-test "`$ACLOCAL --print-ac-dir`" = "$top_testsrcdir/m4"
+test "`$ACLOCAL --print-ac-dir`" = "$top_testsrcdir/m4/acdir"

 $ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir
 test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo
@@ -30,6 +30,7 @@ $ACLOCAL --system-acdir /bar --print-ac-dir
 test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar

 $ACLOCAL --automake-acdir /bar --print-ac-dir
-test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = "$top_testsrcdir/m4"
+test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = \
+    "$top_testsrcdir/m4/acdir"

 :
--
1.7.7.419.g87009



reply via email to

[Prev in Thread] Current Thread [Next in Thread]