Hi!
This fixes a fail on Cygwin (and others I suppose).
I'm aware that the lax non-gnu-tar branch adds even more laxness
since $EXEEXT normally contains a dot for the oddball cases when
it's non-empty, but that's so minor that I didn't bother to code
around it...
Ok for maint?
Cheers,
Peter
2011-09-05 Peter Rosin <p...@lysator.liu.se>
* tests/amhello-binpkg.test: Add missing $EXEEXT usage.
>From 396f69c65ddc01ebbcfcccb59381a80b9c050b1a Mon Sep 17 00:00:00 2001
From: Peter Rosin <p...@lysator.liu.se>
Date: Mon, 5 Sep 2011 00:31:48 +0200
Subject: [PATCH] * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
Signed-off-by: Peter Rosin <p...@lysator.liu.se>
---
ChangeLog | 6 +++++-
tests/amhello-binpkg.test | 8 +++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index add6c9c..b768311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2011-09-04 Stefano Lattarini <stefano.lattar...@gmail.com>
+2011-09-05 Peter Rosin <p...@lysator.liu.se>
+
+ * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
+
+2011-09-04 Stefano Lattarini <stefano.lattar...@gmail.com>
fix: list test 'vala-vpath.test' in XFAIL_TESTS
* tests/Makefile.am (XFAIL_TESTS): Update.
diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
index f11421f..165078c 100755
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -34,16 +34,18 @@ cd inst
find . -type f -print > ../files.lst
tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > tar.got 2>&1
+eval `sed -n -e 's/^EXEEXT = /EXEEXT=/p' < ../Makefile`
+
if tar --version </dev/null | grep GNU; then
LC_ALL=C sort tar.got > t
mv -f t tar.got
- diff - tar.got <<'END'
-./usr/bin/hello
+ diff - tar.got <<END
+./usr/bin/hello$EXEEXT
./usr/share/doc/amhello/README
END
else
: Be laxer with other tar implementations, to avoid spurious failures.
- $EGREP '(^| )\./usr/bin/hello( |$)' tar.got
+ $EGREP '(^| )\./usr/bin/hello'$EXEEXT'( |$)' tar.got
$EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got
fi
--
1.7.5.1
