diff options
| author | Jim Meyering <meyering@redhat.com> | 2012-08-28 12:02:05 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2012-10-23 16:13:40 +0200 |
| commit | a11a7d7fc9b5f494fdcc20445706f594903a79f2 (patch) | |
| tree | 6d97c77c81de3cf6478d8e4f939b5f6b839e4803 /testsuite/init.sh | |
| parent | 5065f95db429ababfaac10f5cd32f3906bd54329 (diff) | |
| download | idutils-a11a7d7fc9b5f494fdcc20445706f594903a79f2.tar.gz idutils-a11a7d7fc9b5f494fdcc20445706f594903a79f2.tar.bz2 idutils-a11a7d7fc9b5f494fdcc20445706f594903a79f2.zip | |
build: update gnulib, bootstrap and init.sh
Diffstat (limited to 'testsuite/init.sh')
| -rw-r--r-- | testsuite/init.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/testsuite/init.sh b/testsuite/init.sh index 5985552..5f6e638 100644 --- a/testsuite/init.sh +++ b/testsuite/init.sh @@ -207,6 +207,14 @@ else fi fi +# If this is bash, turn off all aliases. +test -n "$BASH_VERSION" && unalias -a + +# Note that when supporting $EXEEXT (transparently mapping from PROG_NAME to +# PROG_NAME.exe), we want to support hyphen-containing names like test-acos. +# That is part of the shell-selection test above. Why use aliases rather +# than functions? Because support for hyphen-containing aliases is more +# widespread than that for hyphen-containing function names. test -n "$EXEEXT" && shopt -s expand_aliases # Enable glibc's malloc-perturbing option. @@ -255,7 +263,10 @@ compare_dev_null_ () return 2 } -if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then +if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \ + && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then + # diff accepts the -u option and does not (like AIX 7 'diff') produce an + # extra space on column 1 of every content line. if test -z "$diff_out_"; then compare_ () { diff -u "$@"; } else @@ -400,8 +411,7 @@ path_prepend_ () case $path_dir_ in '') fail_ "invalid path dir: '$1'";; /*) abs_path_dir_=$path_dir_;; - *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \ - || fail_ "invalid path dir: $path_dir_";; + *) abs_path_dir_=$initial_cwd_/$path_dir_;; esac case $abs_path_dir_ in *:*) fail_ "invalid path dir: '$abs_path_dir_'";; @@ -437,7 +447,7 @@ setup_ () pfx_=`testdir_prefix_` test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \ || fail_ "failed to create temporary directory in $initial_cwd_" - cd "$test_dir_" + cd "$test_dir_" || fail_ "failed to cd to temporary directory" # As autoconf-generated configure scripts do, ensure that IFS # is defined initially, so that saving and restoring $IFS works. |