automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[FYI] {master} tests: fix portability issues in 'repeated-options.test'


From: Stefano Lattarini
Subject: [FYI] {master} tests: fix portability issues in 'repeated-options.test'
Date: Sun, 15 May 2011 14:46:03 +0200
User-agent: KMail/1.13.3 (Linux/2.6.30-2-686; KDE/4.4.4; i686; ; )

I've applied the attached patch to a temporary bugfixing branch, merged
into master, and pushed.

Regards,
   Stefano
From 63796a15ef7d6cbff0fe734f8c293368183d6516 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
From: Stefano Lattarini <address@hidden>
Date: Sun, 15 May 2011 14:41:35 +0200
Subject: [PATCH] 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)'.
---
 ChangeLog                   |    7 +++++++
 tests/repeated-options.test |   12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c29d820..6b12300 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)'.
+
 2010-11-19  Stefano Lattarini  <address@hidden>
 
        New test on repeated automake options.
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
index 84901f8..2f946b5 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
-- 
1.7.2.3


reply via email to

[Prev in Thread] Current Thread [Next in Thread]