[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-679-g32cde2a

[Peter Rosin]

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=32cde2a4722d25ad41e5ae2e33d43ceb2c6f4a90

The branch, maint has been updated
       via  32cde2a4722d25ad41e5ae2e33d43ceb2c6f4a90 (commit)
      from  0436a1ed2c44b9e8b3c8f2f049e06bfac4969d3e (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 32cde2a4722d25ad41e5ae2e33d43ceb2c6f4a90
Author: Peter Rosin <address@hidden>
Date:   Mon Jan 30 20:57:12 2012 +0100

    tests: do not assume the object file extension is .o
    
    * tests/specflg7.test: Dig out the object file extension from the
    OBJEXT makefile variable.
    * tests/substref.test: Likewise.
    * tests/specflg8.test: Likewise.  Also check that the false-true
    object is created instead of checking the true-true object twice.
    * tests/suffix8.test: Add a chain rule for the case where the
    object file extension is .obj.

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

Summary of changes:
 tests/specflg7.test |    7 ++++---
 tests/specflg8.test |    7 ++++---
 tests/substref.test |    5 +++--
 tests/suffix8.test  |    5 ++++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/tests/specflg7.test b/tests/specflg7.test
index 067a36d..e41b316 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -59,5 +59,6 @@ $AUTOMAKE -a
 $MAKE
 ./true | grep true
 ./false | grep false
-test -f ./t-false.o
-test -f ./f-false.o
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+test -f ./t-false.$objext
+test -f ./f-false.$objext
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 79daa15..c5a30d7 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -59,7 +59,8 @@ $MAKE
 ./true
 ./false && Exit 1
 
-test -f ./true-true.o
-test -f ./true-true.o
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+test -f ./true-true.$objext
+test -f ./false-true.$objext
 
 :
diff --git a/tests/substref.test b/tests/substref.test
index 23dc168..6bbe8b1 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010, 2011, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -56,7 +56,8 @@ $AUTOMAKE -a
 
 ./configure
 
-echo dlmain.c dlmain.o >exp
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+echo dlmain.c dlmain.$objext >exp
 $MAKE got
 cat got
 diff exp got
diff --git a/tests/suffix8.test b/tests/suffix8.test
index 70ff3a5..4279ad6 100755
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2010, 2012 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,6 +40,9 @@ libfoo_la_SOURCES = bar.x_
 .y_.o:
        cp $< $@
 
+.y_.obj:
+       cp $< $@
+
 .y_.z_:
        cp $< $@
 


hooks/post-receive
-- 
GNU Automake