Merge branch 'maint'

[platform/upstream/automake.git] / tests / get-sysconf.test

diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index cbcf076..ae3310e 100755 (executable)
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 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
@@ -15,20 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Dummy test case, aimed at reporting useful system information in the
-# final `test-suite.log'.  This way, if a user experiences a failure in
-# the Automake test suite and then only sends us the `test-suite.log',
+# final 'test-suite.log'.  This way, if a user experiences a failure in
+# the Automake test suite and then only sends us the 'test-suite.log',
 # we won't have to ask him for more information to start analyzing the
 # failure (that had happened too many times in the past!).
 
 . ./defs || Exit 1
 
-set -e
-
-# FIXME: remove these once we are merged into master.
-top_testsrcdir=$testsrcdir/..
-testbuilddir=`(cd .. && pwd)`
-top_testbuilddir=`(cd $testbuilddir/.. && pwd)`
-
 st=0
 if test -d "$top_testsrcdir"/.git; then
   # We are running from a git checkout.
@@ -49,13 +42,17 @@ else
         "be available"
 fi
 $PERL -V || st=1
+# It's OK for the user not to have the TAP::Parser module; this can
+# happen with older perl installation, or on MinGW/MSYS.
+$PERL -e 'use TAP::Parser; print $TAP::Parser::VERSION, "\n"' || :
+
 cat "$top_testbuilddir/config.log" || st=1
-cat "$testbuilddir/aclocal-$APIVERSION" || st=1
-cat "$testbuilddir/automake-$APIVERSION" || st=1
+cat "$testbuilddir/wrap/aclocal-$APIVERSION" || st=1
+cat "$testbuilddir/wrap/automake-$APIVERSION" || st=1
 
 if test $st -eq 0; then
   # This test SKIPs, so that all the information it has gathered and
-  # printed will get unconditionally copied into the `test-suite.log'
+  # printed will get unconditionally copied into the 'test-suite.log'
   # file.
   Exit 77
 fi