| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273 |
- From 300560c8d4a63c9bb43a01289269cec707e5ea6d Mon Sep 17 00:00:00 2001
- From: Szabolcs Nagy <nsz@port70.net>
- Date: Sun, 6 Nov 2016 03:13:26 +0000
- Subject: [PATCH 05/13] libitm test fix
- ---
- libitm/testsuite/Makefile.am | 6 ++++++
- libitm/testsuite/Makefile.in | 5 +++++
- libitm/testsuite/lib/libitm.exp | 3 +++
- 3 files changed, 14 insertions(+)
- diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
- index 41cfbc46e4b..16f82bdf691 100644
- --- a/libitm/testsuite/Makefile.am
- +++ b/libitm/testsuite/Makefile.am
- @@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
- _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
- RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
- +
- +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
- +
- +extra.exp:
- + echo 'set BUILD_CC "$(CC)"' > $@.tmp
- + mv $@.tmp $@
- diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
- index 991f02c0b3b..fa331cabfc4 100644
- --- a/libitm/testsuite/Makefile.in
- +++ b/libitm/testsuite/Makefile.in
- @@ -285,6 +285,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
- echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
-
- RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
- +EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
- all: all-am
-
- .SUFFIXES:
- @@ -492,6 +493,10 @@ uninstall-am:
- .PRECIOUS: Makefile
-
-
- +extra.exp:
- + echo 'set BUILD_CC "$(CC)"' > $@.tmp
- + mv $@.tmp $@
- +
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
- index b3d247b9f98..47c2cd55dac 100644
- --- a/libitm/testsuite/lib/libitm.exp
- +++ b/libitm/testsuite/lib/libitm.exp
- @@ -77,6 +77,7 @@ proc libitm_init { args } {
- global ALWAYS_CFLAGS
- global CFLAGS
- global TOOL_EXECUTABLE TOOL_OPTIONS
- + global BUILD_CC
- global GCC_UNDER_TEST
- global TESTING_IN_BUILD_TREE
- global target_triplet
- @@ -92,6 +93,8 @@ proc libitm_init { args } {
- if ![info exists GCC_UNDER_TEST] then {
- if [info exists TOOL_EXECUTABLE] {
- set GCC_UNDER_TEST $TOOL_EXECUTABLE
- + } elseif [info exists BUILD_CC] {
- + set GCC_UNDER_TEST $BUILD_CC
- } else {
- set GCC_UNDER_TEST "[find_gcc]"
- }
- --
- 2.21.0
|
