py-compile tests: more faithful 'installcheck' support

* tests/py-compile-basedir.test: Use the `$am_scriptsdir' variable
instead of `$testsrcdir/../lib', to test more faithfully under
"make installcheck".  More uses of the `fatal_' subroutine to
diagnose hard errors.
* tests/py-compile-basic.test: Likewise.
* tests/py-compile-basic2.test: Likewise.
* tests/py-compile-destdir.test: Likewise.
* tests/py-compile-env.test: Likewise.
* tests/py-compile-option-terminate.test: Likewise.
* tests/py-compile-usage.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 028d268a7fa1421a9f40a303e9094e74f293976e..96275da9e5a7b3a8f5f7ab23368f1271a4f554b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       py-compile tests: more faithful 'installcheck' support
+       * tests/py-compile-basedir.test: Use the `$am_scriptsdir' variable
+       instead of `$testsrcdir/../lib', to test more faithfully under
+       "make installcheck".  More uses of the `fatal_' subroutine to
+       diagnose hard errors.
+       * tests/py-compile-basic.test: Likewise.
+       * tests/py-compile-basic2.test: Likewise.
+       * tests/py-compile-destdir.test: Likewise.
+       * tests/py-compile-env.test: Likewise.
+       * tests/py-compile-option-terminate.test: Likewise.
+       * tests/py-compile-usage.test: Likewise.
+
 2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: remove redundant settings of `errexit' shell flag

diff --git a/tests/py-compile-basedir.test b/tests/py-compile-basedir.test
index d48301b1c172111c9e44b03f021b713194ff48bd..1eee98021ddc5ebe0ba0ca48b98a2055851d4e12 100755 (executable)
--- a/tests/py-compile-basedir.test
+++ b/tests/py-compile-basedir.test
@@ -24,7 +24,8 @@ required=python
 mkdir sandbox
 cd sandbox
 
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 
 f=__init__
 for d in foo foo/bar "`pwd`/foo" . .. ../foo ''; do

diff --git a/tests/py-compile-basic.test b/tests/py-compile-basic.test
index 6ea4d907fdccaafeb209440a6531a7b80b1fe643..f8d083e7d3ce23b585980cb7dea2e12d2b5e5152 100755 (executable)
--- a/tests/py-compile-basic.test
+++ b/tests/py-compile-basic.test
@@ -21,7 +21,8 @@
 required=python
 . ./defs || Exit 1
 
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 
 cat > foo.py <<'END'
 # Try out some non-trivial syntax in here.

diff --git a/tests/py-compile-basic2.test b/tests/py-compile-basic2.test
index 0e81e4386e5e2e5083df73e09a2d5c20bd5d5ced..cbb58908b15c2113d2a44f4c5bc9c3bf04d71fba 100755 (executable)
--- a/tests/py-compile-basic2.test
+++ b/tests/py-compile-basic2.test
@@ -53,7 +53,8 @@ lst='
 
 mkdir dir
 cd dir
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 mkdir sub sub/subsub
 touch $pyfiles
 ./py-compile $pyfiles

diff --git a/tests/py-compile-destdir.test b/tests/py-compile-destdir.test
index 59b7a7886b09a2781a509083b4a5e8520e118e23..1bcd17be5e8798b618f8ab4532c65379ebe7ead4 100755 (executable)
--- a/tests/py-compile-destdir.test
+++ b/tests/py-compile-destdir.test
@@ -19,7 +19,8 @@
 required=python
 . ./defs || Exit 1
 
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 
 # Should not give false positives when grepping for it, so use
 # an "uncommon" string (with ugly CamelCase).

diff --git a/tests/py-compile-env.test b/tests/py-compile-env.test
index 028c7960e45aa90033144a5a93fa3cdabaedaaae..df6b7373a728dd53acf073a485d16aeabcf540ff 100755 (executable)
--- a/tests/py-compile-env.test
+++ b/tests/py-compile-env.test
@@ -18,7 +18,8 @@
 
 . ./defs || Exit 1
 
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 
 cat > my-py <<'END'
 #!/bin/sh

diff --git a/tests/py-compile-option-terminate.test b/tests/py-compile-option-terminate.test
index 20baca4e2dd607edda13da5e8f43b499bcc7da1b..74bf63811fc4bae71e0f7d1efe55786b12e6a0df 100755 (executable)
--- a/tests/py-compile-option-terminate.test
+++ b/tests/py-compile-option-terminate.test
@@ -20,7 +20,8 @@
 required=python
 . ./defs || Exit 1
 
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 
 : > ./-o.py
 : > ./--foo.py

diff --git a/tests/py-compile-usage.test b/tests/py-compile-usage.test
index 0ec2427558ad5c32ad425a5406077280a383f09c..0e2088d92ed500e4b3383de252aeb73f9722c610 100755 (executable)
--- a/tests/py-compile-usage.test
+++ b/tests/py-compile-usage.test
@@ -19,7 +19,8 @@
 
 . ./defs || Exit 1
 
-cp "$testsrcdir/../lib/py-compile" .
+cp "$am_scriptdir/py-compile" . \
+  || fatal_ "failed to fetch auxiliary script py-compile"
 
 # --help