summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2014-02-04 09:08:38 +0000
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2014-02-04 09:08:38 +0000
commit743164d217400afc91318beeb2e984d8eedf21dc (patch)
treefbd89dd496b892ac8ac8ec1dcf271e5988fccea0
parent5fc776946f5178139a6ec015d4f5707d377ff492 (diff)
downloadgcc-743164d217400afc91318beeb2e984d8eedf21dc.tar.gz
* lib/tsan-dg.exp (tsan_init): Set trivial testcase
timeout value to 20s. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207453 138bc75d-0d04-0410-961f-82ee72b054a4
-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 ee68207755d..66adf758dc4 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 89696a9c00f..f313123aaaa 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 } {