[Automake-commit] [SCM] GNU Automake branch, java-work, updated. v1.11-379-gbf1d029

[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=bf1d029660136387a9fd4a451b230f954a81db5c

The branch, java-work has been updated
       via  bf1d029660136387a9fd4a451b230f954a81db5c (commit)
       via  2fec9f098ac951e1f7725bce5894c3c7355c59ba (commit)
       via  daa946a431442335bdf965e27b6f81f6c109fddc (commit)
       via  a370e2f5cd098af9b95314cdd49b0fbee6588a82 (commit)
      from  2c2e5b4c334e7af191df3b6dfcc82001030447bc (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 bf1d029660136387a9fd4a451b230f954a81db5c
Merge: 2c2e5b4 2fec9f0
Author: Stefano Lattarini <address@hidden>
Date:   Thu May 19 22:02:07 2011 +0200

    Merge branch 'maint' into java-work
    
    * maint:
      test defs: rename requirement 'non-cross' -> 'native'
      testsuite: be more cross-compile friendly
      tests: fix spurious failure of txinfo21.test on FreeBSD

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

Summary of changes:
 ChangeLog           |   26 ++++++++++++++++++++++++++
 tests/defs.in       |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 tests/txinfo21.test |    4 ++--
 3 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a8c01f..33c4c9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2011-05-19  Stefano Lattarini  <address@hidden>
+
+       test defs: rename requirement 'non-cross' -> 'native'
+       * tests/defs.in (non-cross): Rename requirement ...
+       (native): ... to this, which is clearer and fits the
+       existing lingo better.
+       Suggestion by Ralf Wildenhues.
+
+2011-05-15  Stefano Lattarini  <address@hidden>
+
+       testsuite: be more cross-compile friendly
+       * tests/defs.in (cross_compiling): New subroutine.
+       (am__tool_prefix): New internal variable.
+       (gcc, g++, gcj): Force the use of the correct "tool prefix"
+       when cross compiling.
+       (gfortran, g77, non-cross): New requirements.
+
+2011-05-07  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure of txinfo21.test on FreeBSD
+       * tests/txinfo21.test: Use the `is_newest' subroutine instead of
+       the `ls -t' hack to to determine whether a file has been updated.
+       This is required because at least FreeBSD `ls' do not sort files
+       with the same timestamp in alphabetical order when using the `-t'
+       option.
+
 2011-05-04  Stefano Lattarini  <address@hidden>
 
        tests defs: use `skip_' for skipping java-related tests
diff --git a/tests/defs.in b/tests/defs.in
index 1db8464..5971dbb 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -148,6 +148,23 @@ fail_ () { warn_ "$me: failed test: $@"; Exit 1; }
 skip_ () { warn_ "$me: skipped test: $@"; Exit 77; }
 framework_failure_ () { warn_ "$me: set-up failure: $@"; Exit 99; }
 
+# cross_compiling
+# ---------------
+# Tell whether we are cross-compiling.  This is especially useful to skip
+# tests (or portions of them) that requires a native compiler.
+cross_compiling ()
+{
+  test x"$host_alias" != x
+}
+
+# So that we can force the use of correct gcc, g++ etc., consistently
+# with cross-compilation settings.
+if cross_compiling; then
+  am__tool_prefix="$host_alias-"
+else
+  am__tool_prefix=
+fi
+
 for tool in : $required
 do
   # Check that each required tool is present.
@@ -195,24 +212,48 @@ do
       # always use it.  This is important only when the user
       # has defined CC in his environment, otherwise ./configure will
       # prefer gcc to other compilers.
-      CC=gcc
+      CC=${am__tool_prefix}gcc
       export CC
       echo "$me: running $CC --version"
       ( $CC --version ) || exit 77
       ;;
     gcj)
-      GCJ=gcj
+      GCJ=${am__tool_prefix}gcj
       export GCJ
       echo "$me: running $GCJ --version"
       ( $GCJ --version ) || exit 77
       ( $GCJ -v ) || exit 77
       ;;
     g++)
-      CXX=g++
+      CXX=${am__tool_prefix}g++
       export CXX
       echo "$me: running $CXX --version"
       ( $CXX --version ) || exit 77
       ;;
+    gfortran)
+      FC=${am__tool_prefix}gfortran
+      export FC
+      echo "$me: running $FC --version"
+      $FC --version || skip_ "GNU Fortran compiler not available"
+      echo "$me: running $FC -v"
+      $FC -v || skip_ "botched installation for GNU Fortran compiler"
+      case " $required " in
+        *\ g77\ *) ;;
+        *) F77=$FC; export F77;;
+      esac
+      ;;
+    g77)
+      F77=${am__tool_prefix}g77
+      export F77
+      echo "$me: running $F77 --version"
+      $F77 --version || skip_ "GNU Fortran 77 compiler not available"
+      echo "$me: running $F77 -v"
+      $F77 -v || skip_ "botched installation for GNU Fortran 77 compiler"
+      case " $required " in
+        *\ gfortran\ *) ;;
+        *) FC=$F77; export FC;;
+      esac
+      ;;
     icc)
       CC=icc
       export CC
@@ -256,6 +297,9 @@ do
       rm -f $priv_check_temp
       test $overwrite_status = 0 && exit 77
       ;;
+    native)
+      cross_compiling && skip_ "doesn't work in cross-compile mode"
+      ;;
     python)
       # Python doesn't support --version, it has -V
       echo "$me: running python -V"
diff --git a/tests/txinfo21.test b/tests/txinfo21.test
index 4bbce4a..5644c0b 100755
--- a/tests/txinfo21.test
+++ b/tests/txinfo21.test
@@ -95,11 +95,11 @@ test -d sub/main2.html
 test -d rec/main3.html
 
 # Rebuilding main.html should cause its timestamp to be updated.
-test `ls -1td main.texi main.html | sed 1q` = main.html
+is_newest main.html main.texi
 $sleep
 touch main.texi
 $MAKE html
-test `ls -1td main.texi main.html | sed 1q` = main.html
+is_newest main.html main.texi
 
 $MAKE clean
 test ! -d main.html


hooks/post-receive
-- 
GNU Automake