tests: expose automake bug#14560

[platform/upstream/automake.git] / t / python11.sh

diff --git a/t/python11.sh b/t/python11.sh
old mode 100755 (executable)
new mode 100644 (file)
index aff3c9c..faf09d8
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 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
@@ -17,7 +17,10 @@
 # Test missing python.
 
 # Python is not required for this test.
-. ./defs || Exit 1
+. test-init.sh
+
+# We don't want to allow user overrides in this test.
+unset PYTHON
 
 cat >>configure.ac <<'EOF'
 m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
@@ -33,22 +36,22 @@ EOF
 $ACLOCAL
 $AUTOCONF
 
-./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; Exit 1; }
+./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; exit 1; }
 cat stdout
 cat stderr >&2
 grep 'checking for IShouldNotExist1' stdout
 grep 'checking for IShouldNotExist2' stdout
 grep 'no suitable Python interpreter found' stderr
 
-sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.int
-mv -f configure.int configure.ac
+sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.ac >configure.tmp
+mv -f configure.tmp configure.ac
 $ACLOCAL --force
 $AUTOCONF --force
 # This one should define PYTHON as ":" and exit successfully.
 ./configure
 
 # Any user setting should be used.
-./configure PYTHON=foo >stdout && { cat stdout; Exit 1; }
+./configure PYTHON=foo >stdout && { cat stdout; exit 1; }
 cat stdout
 grep 'PYTHON = foo' stdout