[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-820-g670146a

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=670146aeb51fdf3063c3e479c761a921a7053700

The branch, master has been updated
       via  670146aeb51fdf3063c3e479c761a921a7053700 (commit)
       via  63796a15ef7d6cbff0fe734f8c293368183d6516 (commit)
      from  8e4e230f603e689c2415e1a621eafebb7540c6b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 670146aeb51fdf3063c3e479c761a921a7053700
Merge: 8e4e230 63796a1
Author: Stefano Lattarini <address@hidden>
Date:   Sun May 15 14:41:57 2011 +0200

    Merge branch 'test-repeated-options-portability-fix'

commit 63796a15ef7d6cbff0fe734f8c293368183d6516
Author: Stefano Lattarini <address@hidden>
Date:   Sun May 15 14:41:35 2011 +0200

    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)'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    7 +++++++
 tests/repeated-options.test |   12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bca207..ab98c38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-15  Stefano Lattarini  <address@hidden>
+
+       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)'.
+
 2011-05-07  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious failure of txinfo21.test on FreeBSD
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
index 4ad6be6..c3c2e29 100755
--- a/tests/repeated-options.test
+++ b/tests/repeated-options.test
@@ -34,14 +34,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
 
@@ -62,9 +68,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


hooks/post-receive
-- 
GNU Automake