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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee68207755dcf00e368b9d66d0370fd4be7eef79..66adf758dc4154f500983893e157945ffd71b6d6 100644 (file)
--- 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 89696a9c00fca4847939a7d52f23c007c0d47fbd..f313123aaaa4a55fb479cf3df67b7137d12e3b10 100644 (file)
--- 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 } {