diff options
author | Peter Rosin <peda@lysator.liu.se> | 2015-11-24 12:39:59 +0100 |
---|---|---|
committer | Peter Rosin <peda@lysator.liu.se> | 2015-11-24 12:39:59 +0100 |
commit | 46fd67c9720ee15a37357cea5190b77f3053cac4 (patch) | |
tree | e8d4956fd7c4e194e0270fc0a42ac4709918acfb /t | |
parent | 92ed3be97837a3de1634a13959c70c686b17d38d (diff) | |
parent | c40e27e1c2a60f58e72e65d73d808f782d55494a (diff) | |
download | automake-46fd67c9720ee15a37357cea5190b77f3053cac4.tar.gz |
Merge branch 'micro' into minor
* micro:
compile: add icl to compile wrapper script
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Diffstat (limited to 't')
-rw-r--r-- | t/ax/am-test-lib.sh | 11 | ||||
-rw-r--r-- | t/compile7.sh | 82 | ||||
-rw-r--r-- | t/list-of-tests.mk | 1 |
3 files changed, 94 insertions, 0 deletions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh index 35541c323..529d93bcd 100644 --- a/t/ax/am-test-lib.sh +++ b/t/ax/am-test-lib.sh @@ -779,6 +779,17 @@ require_tool () $CC -? </dev/null \ || skip_all_ "Microsoft C compiler '$CC' not available" ;; + icl) + CC=icl + # Don't export CFLAGS, as that could have been initialized to only + # work with the C compiler detected at configure time. If the user + # wants CFLAGS to also influence 'icl', he can still export CFLAGS + # in the environment "by hand" before calling the testsuite. + export CC CPPFLAGS + echo "$me: running $CC -?" + $CC -? >/dev/null \ + || skip_all_ "Intel C compiler '$CC' not available" + ;; etags) # Exuberant Ctags will create a TAGS file even # when asked for --help or --version. (Emacs's etags diff --git a/t/compile7.sh b/t/compile7.sh new file mode 100644 index 000000000..0dad8fb70 --- /dev/null +++ b/t/compile7.sh @@ -0,0 +1,82 @@ +#! /bin/sh +# Copyright (C) 2010-2015 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Make sure 'compile' wraps the Intel C/C++ compiler (icl) correctly +# with respect to absolute paths. + +required='icl' +. test-init.sh + +get_shell_script compile + +mkdir sub + +cat >sub/foo.c <<'EOF' +int foo (void) +{ + return 0; +} +EOF + +cat >main.c <<'EOF' +extern int foo (void); +int main (void) +{ + return foo (); +} +EOF + +cwd=$(pwd) || fatal_ "cannot get current directory" +absfoodir=$cwd/sub +absmainc=$cwd/main.c +absmainobj=$cwd/main.obj + +cat >> configure.ac << 'END' +AC_PROG_CC +AM_PROG_AR +AC_PROG_RANLIB +AC_CONFIG_FILES([sub/Makefile]) +AC_OUTPUT +END + +cat > Makefile.am << 'END' +SUBDIRS = sub +END + +cat > sub/Makefile.am << 'END' +lib_LIBRARIES = libfoo.a +libfoo_a_SOURCES = foo.c +END + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a +./configure +$MAKE + +./compile icl $CPPFLAGS $CFLAGS -c -o "$absmainobj" "$absmainc" + +# POSIX mandates that the compiler accepts a space between the -I, +# -l and -L options and their respective arguments. Traditionally, +# this should work also without a space. Try both usages. +for sp in '' ' '; do + rm -f main + ./compile icl $CFLAGS $LDFLAGS -L${sp}"$absfoodir" "$absmainobj" \ + -o main -l${sp}foo + ./main +done + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 80d0f0864..defca1361 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -271,6 +271,7 @@ t/compile3.sh \ t/compile4.sh \ t/compile5.sh \ t/compile6.sh \ +t/compile7.sh \ t/compile_f90_c_cxx.sh \ t/compile_f_c_cxx.sh \ t/cond-basic.sh \ |