[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-822-g68e6941

[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=68e69411324c7d79a5c274977785d4b3cdba910f

The branch, master has been updated
       via  68e69411324c7d79a5c274977785d4b3cdba910f (commit)
       via  daa946a431442335bdf965e27b6f81f6c109fddc (commit)
      from  670146aeb51fdf3063c3e479c761a921a7053700 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |    9 +++++++++
 tests/defs |   50 +++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab98c38..b3a1e7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 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-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,
diff --git a/tests/defs b/tests/defs
index 6ee1830..3be8ead 100644
--- a/tests/defs
+++ b/tests/defs
@@ -129,6 +129,15 @@ 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
+}
+
 # is_newest FILE FILES
 # --------------------
 # Return false if any file in FILES is newer than FILE.
@@ -231,6 +240,14 @@ sed_unindent_prog="" # Avoid interferences from the 
environment.
 # will be skipped due to some tool missing in $PATH itself.
 echo "$PATH"
 
+# 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
+
 # Look for (and maybe set up) required tools and/or system features; skip
 # the current test if they are not found.
 for tool in : $required
@@ -274,7 +291,7 @@ 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
@@ -282,7 +299,7 @@ do
       $CC -v || exit 77
       ;;
     gcj)
-      GCJ=gcj
+      GCJ=${am__tool_prefix}gcj
       export GCJ
       echo "$me: running $GCJ --version"
       $GCJ --version || exit 77
@@ -290,13 +307,37 @@ do
       $GCJ -v || exit 77
       ;;
     g++)
-      CXX=g++
+      CXX=${am__tool_prefix}g++
       export CXX
       echo "$me: running $CXX --version"
       $CXX --version || exit 77
       echo "$me: running $CXX -v"
       $CXX -v || 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
@@ -345,6 +386,9 @@ do
         exit 77
       fi
       ;;
+    non-cross)
+      cross_compiling && skip_ "doesn't work in cross-compile mode"
+      ;;
     python)
       # Python doesn't support --version, it has -V
       echo "$me: running python -V"


hooks/post-receive
-- 
GNU Automake