tests: more uses of `$top_testsrcdir', in the `amhello' tests

* tests/amhello-binpkg.test: Use `$top_testsrcdir' instead
of `$testsrcdir/..'.
* tests/amhello-cflags.test: Likewise.
* tests/amhello-cross-compile.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index d2771d91ebc8d150b4637a8c3f9fc984d8905841..beb429626b19215e0fed4422716ee87e5ffc0315 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: more uses of `$top_testsrcdir', in the `amhello' tests
+       * tests/amhello-binpkg.test: Use `$top_testsrcdir' instead
+       of `$testsrcdir/..'.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+
 2011-09-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        tests: avoid creating useless files in the `amhello' tests

diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
index 2d57e88141960f23e0f0516c3f92501513eed7dd..00238e894879154fa4cb17886f69940f5c072480 100755 (executable)
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -20,7 +20,7 @@
 am_create_testdir=empty
 . ./defs || Exit 1
 
-cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
+cp "$top_testsrcdir"/doc/amhello-1.0.tar.gz . \
   || fatal_ "cannot get amhello tarball"
 
 gzip -dc amhello-1.0.tar.gz | tar xf -

diff --git a/tests/amhello-cflags.test b/tests/amhello-cflags.test
index 3ec54b8bb25c98b63aa78256015f510bf4ed678a..5811f451d96bc12e2fe03c7711f300b83447fb75 100755 (executable)
--- a/tests/amhello-cflags.test
+++ b/tests/amhello-cflags.test
@@ -22,7 +22,7 @@ am_create_testdir=empty
 required=gcc
 . ./defs || Exit 1
 
-cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
+cp "$top_testsrcdir"/doc/amhello-1.0.tar.gz . \
   || fatal_ "cannot get amhello tarball"
 
 gzip -dc amhello-1.0.tar.gz | tar xf -

diff --git a/tests/amhello-cross-compile.test b/tests/amhello-cross-compile.test
index a4a21d1fcf1cc20302a1848538a524bbb046a707..cd00307cbb684dadc2b7cad7ee50f091f98f162b 100755 (executable)
--- a/tests/amhello-cross-compile.test
+++ b/tests/amhello-cross-compile.test
@@ -21,11 +21,11 @@ am_create_testdir=empty
 required=i586-mingw32msvc-gcc
 . ./defs || Exit 1
 
-cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
+cp "$top_testsrcdir"/doc/amhello-1.0.tar.gz . \
   || fatal_ "cannot get amhello tarball"
 
 host=i586-mingw32msvc
-build=`"$testsrcdir"/../lib/config.guess` && test -n "$build" \
+build=`"$top_testsrcdir"/lib/config.guess` && test -n "$build" \
   || fatal_ "cannot guess build platform"
 case $build in *mingw*) skip_ "build system is MinGW too";; esac