diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-10-12 09:46:38 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-10-12 09:46:38 -0700 |
| commit | 9cd320ea6572c577cdf17ce1f9ea5230b166af6d (patch) | |
| tree | d1c8e7c2e09a91ed75f0e5476c648c2e745aa2de /libphobos/testsuite | |
| parent | 4854d721be78358e59367982bdd94461b4be3c5a (diff) | |
| parent | 3175d40fc52fb8eb3c3b18cc343d773da24434fb (diff) | |
| download | gcc-9cd320ea6572c577cdf17ce1f9ea5230b166af6d.zip gcc-9cd320ea6572c577cdf17ce1f9ea5230b166af6d.tar.gz gcc-9cd320ea6572c577cdf17ce1f9ea5230b166af6d.tar.bz2 | |
Merge from trunk revision 3175d40fc52fb8eb3c3b18cc343d773da24434fb.
Diffstat (limited to 'libphobos/testsuite')
| -rw-r--r-- | libphobos/testsuite/Makefile.in | 4 | ||||
| -rw-r--r-- | libphobos/testsuite/lib/libphobos.exp | 4 | ||||
| -rwxr-xr-x | libphobos/testsuite/testsuite_flags.in | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libphobos/testsuite/Makefile.in b/libphobos/testsuite/Makefile.in index 66077fc..2f6911d 100644 --- a/libphobos/testsuite/Makefile.in +++ b/libphobos/testsuite/Makefile.in @@ -93,6 +93,8 @@ target_triplet = @target@ subdir = testsuite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/cet.m4 \ + $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ @@ -149,6 +151,8 @@ CC = @CC@ CCAS = @CCAS@ CCASFLAGS = @CCASFLAGS@ CC_FOR_BUILD = @CC_FOR_BUILD@ +CET_DFLAGS = @CET_DFLAGS@ +CET_FLAGS = @CET_FLAGS@ CFLAGS = @CFLAGS@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CHECKING_DFLAGS = @CHECKING_DFLAGS@ diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp index 2e9da95..790480b 100644 --- a/libphobos/testsuite/lib/libphobos.exp +++ b/libphobos/testsuite/lib/libphobos.exp @@ -105,6 +105,7 @@ proc libphobos_init { args } { global gdcpaths gdcldflags global gluefile wrap_flags global ld_library_path + global tool_timeout global DEFAULT_DFLAGS # If a testcase doesn't have special options, use these. @@ -185,6 +186,9 @@ proc libphobos_init { args } { } } + # Set the default timeout for phobos tests. + set tool_timeout 600 + set_ld_library_path_env_vars libphobos_maybe_build_wrapper "${objdir}/testglue.o" diff --git a/libphobos/testsuite/testsuite_flags.in b/libphobos/testsuite/testsuite_flags.in index 14b6795..6a2d79f 100755 --- a/libphobos/testsuite/testsuite_flags.in +++ b/libphobos/testsuite/testsuite_flags.in @@ -28,7 +28,7 @@ case ${query} in ;; --gdcflags) GDCFLAGS_default="-fmessage-length=0 -fno-show-column" - GDCFLAGS_config="@WARN_DFLAGS@ @GDCFLAGS@ -fno-release -funittest" + GDCFLAGS_config="@WARN_DFLAGS@ @GDCFLAGS@ @CET_DFLAGS@ -fno-release -funittest" echo ${GDCFLAGS_default} ${GDCFLAGS_config} ;; --gdcpaths) |