From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 15 May 2011 12:41:35 +0000 (+0200)
Subject: tests: fix portability issues in 'repeated-options.test'
X-Git-Tag: ng-0.5a~178^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63796a15ef7d6cbff0fe734f8c293368183d6516;p=thirdparty%2Fautomake.git

tests: fix portability issues in 'repeated-options.test'

* tests/repeated-options.test: Do not assume that object files
have `.o' suffix and executables have no default suffix; instead,
use `$(OBJEXT)' and `$(EXEEXT)'.
---

diff --git a/ChangeLog b/ChangeLog
index c29d8200b..6b123009c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: fix portability issues in 'repeated-options.test'
+	* tests/repeated-options.test: Do not assume that object files
+	have `.o' suffix and executables have no default suffix; instead,
+	use `$(OBJEXT)' and `$(EXEEXT)'.
+
 2010-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	New test on repeated automake options.
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
index 84901f82c..2f946b542 100755
--- a/tests/repeated-options.test
+++ b/tests/repeated-options.test
@@ -36,14 +36,20 @@ AUTOMAKE_OPTIONS = parallel-tests subdir-objects subdir-objects
 AUTOMAKE_OPTIONS += dist-bzip2 parallel-tests
 TESTS = foo.test
 EXTRA_DIST = $(TESTS)
+TESTS_ENVIRONMENT = EXEEXT='$(EXEEXT)'
 bin_PROGRAMS = sub/foo
+.PHONY: test-build
+test-build:
+	ls -l . sub
+	test -f sub/foo.$(OBJEXT)
+	test -f sub/foo$(EXEEXT)
 END
 
 mkdir sub
 
 cat > foo.test <<'END'
 #!/bin/sh
-test -f sub/foo && test -x sub/foo
+test -f sub/foo$EXEEXT && test -x sub/foo$EXEEXT
 END
 chmod a+x foo.test
 
@@ -64,9 +70,7 @@ $AUTOCONF
 
 ./configure
 $MAKE
-ls -l . sub
-test -f sub/foo.o
-test -f sub/foo
+$MAKE test-build
 $MAKE check
 ls -l
 test -f foo.log