Make sure we're running dejagnu tests with the right compiler.

This commit is contained in:
Anthony Green
2013-01-08 15:14:21 -05:00
parent f26c7ca671
commit 8308984e47
5 changed files with 19 additions and 0 deletions

View File

@@ -1,5 +1,11 @@
2013-01-08 Anthony Green <green@moxielogic.com> 2013-01-08 Anthony Green <green@moxielogic.com>
* configure.ac: Generate local.exp. This sets CC_FOR_TARGET
when we are using the vendor compiler.
* testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): Point to
../local.exp.
* configure, testsuite/Makefile.in: Rebuilt.
* testsuite/libffi.call/call.exp: Run tests with different * testsuite/libffi.call/call.exp: Run tests with different
options, depending on whether or not we are using gcc or the options, depending on whether or not we are using gcc or the
vendor compiler. vendor compiler.

5
configure vendored
View File

@@ -13068,6 +13068,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -fexceptions" CFLAGS="$CFLAGS -fexceptions"
touch testsuite/local.exp
else
cat > local.exp <<EOF
set CC_FOR_TARGET $CC
EOF
fi fi

View File

@@ -40,6 +40,11 @@ AX_CC_MAXOPT
AX_CFLAGS_WARN_ALL AX_CFLAGS_WARN_ALL
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -fexceptions" CFLAGS="$CFLAGS -fexceptions"
touch testsuite/local.exp
else
cat > local.exp <<EOF
set CC_FOR_TARGET $CC
EOF
fi fi
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

View File

@@ -13,6 +13,8 @@ RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
AM_RUNTESTFLAGS = AM_RUNTESTFLAGS =
EXTRA_DEJAGNU_SITE_CONFIG=../local.exp
CLEANFILES = *.exe core* *.log *.sum CLEANFILES = *.exe core* *.log *.sum
EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \

View File

@@ -227,6 +227,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
echo $(top_srcdir)/../dejagnu/runtest ; \ echo $(top_srcdir)/../dejagnu/runtest ; \
else echo runtest; fi` else echo runtest; fi`
EXTRA_DEJAGNU_SITE_CONFIG = ../local.exp
CLEANFILES = *.exe core* *.log *.sum CLEANFILES = *.exe core* *.log *.sum
EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \
libffi.call/cls_align_longdouble_split.c libffi.call/closure_loc_fn0.c \ libffi.call/cls_align_longdouble_split.c libffi.call/closure_loc_fn0.c \