aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2014-02-04 10:08:38 +0100
committerUros Bizjak <uros@gcc.gnu.org>2014-02-04 10:08:38 +0100
commitf8e162b710b64582e4d55ccfcb25e20003567e01 (patch)
treefbd89dd496b892ac8ac8ec1dcf271e5988fccea0
parent5ab39ec3b0a44718c8e793831f88dc2eff78028c (diff)
downloadgcc-f8e162b710b64582e4d55ccfcb25e20003567e01.zip
gcc-f8e162b710b64582e4d55ccfcb25e20003567e01.tar.gz
gcc-f8e162b710b64582e4d55ccfcb25e20003567e01.tar.bz2
tsan-dg.exp (tsan_init): Set trivial testcase timeout value to 20s.
* lib/tsan-dg.exp (tsan_init): Set trivial testcase timeout value to 20s. From-SVN: r207453
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/lib/tsan-dg.exp7
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee68207..66adf75 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-04 Uros Bizjak <ubizjak@gmail.com>
+
+ * lib/tsan-dg.exp (tsan_init): Set trivial testcase
+ timeout value to 20s.
+
2014-02-03 Jan Hubicka <hubicka@ucw.cz>
PR ipa/59882
diff --git a/gcc/testsuite/lib/tsan-dg.exp b/gcc/testsuite/lib/tsan-dg.exp
index 89696a9..f313123 100644
--- a/gcc/testsuite/lib/tsan-dg.exp
+++ b/gcc/testsuite/lib/tsan-dg.exp
@@ -98,6 +98,10 @@ proc tsan_init { args } {
}
}
if { $link_flags != "" } {
+ global individual_timeout
+
+ # Lower timeout value in case test does not terminate properly.
+ set individual_timeout 20
if [check_runtime_nocache tsan_works {
int main () { return 0; }
} "-fPIE -pie -fsanitize=thread -g"] {
@@ -105,13 +109,14 @@ proc tsan_init { args } {
} else {
set dg-do-what-default compile
}
+ unset individual_timeout
return 1
}
return 0
}
#
-# tsan_finish -- called at the start of each subdir of tests
+# tsan_finish -- called at the end of each subdir of tests
#
proc tsan_finish { args } {