From c3da5a74ffef3cb177270b021c34bd4cd2bb80f5 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 27 Dec 2014 13:52:55 +0100 Subject: tests: avoid some spurious failures on AIX 7.1 * t/lex-noyywrap.sh: Here. * t/instmany-mans.sh: And here. * t/instmany-python.sh: And here. * t/instmany.sh: And here. * t/parallel-tests-concurrency.sh: And here. Signed-off-by: Stefano Lattarini --- t/instmany-python.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 't/instmany-python.sh') diff --git a/t/instmany-python.sh b/t/instmany-python.sh index dfcf14bf2..0088b2d62 100644 --- a/t/instmany-python.sh +++ b/t/instmany-python.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2008-2014 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,6 @@ mkdir x-bin sed "s|@limit@|$limit|g" >x-bin/my-install <<'END' #! /bin/sh -# Fake install script. This doesn't really install -# (the INSTALL path below would be wrong outside this directory). limit=@limit@ PATH=$oPATH; export PATH if test -z "$orig_INSTALL"; then @@ -68,8 +66,16 @@ END # Creative quoting in the next line to please maintainer-check. chmod +x x-bin/'rm' x-bin/my-install -cat > setenv.in <<'END' -orig_INSTALL='@INSTALL@'; export orig_INSTALL +cat >setenv.in <<'END' +orig_INSTALL='@INSTALL@' +# In case we've falled back on the install-sh script (seen e.g., +# on AIX 7.1), we need to make sure we use its absolute path, +# as we don't know from which directory we'll be run. +case "$orig_INSTALL" in + /*) ;; + */*) orig_INSTALL=$(pwd)/$orig_INSTALL;; +esac +export orig_INSTALL END cat >>configure.ac <