[gjs: 8/13] build: Adjust test timeouts

[Philip Chimento <pchimento src gnome org>]

commit 913b4fca55110925316911620a1155c42eb8eb68
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Oct 20 22:18:15 2019 -0700

    build: Adjust test timeouts
    
    On the CI, some tests still time out with the previous values. Let's
    give them more than enough to account for differing loads on the CI
    machines.
    
    We also increase Jasmine's timeout for individual async callbacks when
    in GC zeal mode.

 installed-tests/js/minijasmine.js | 7 +++++++
 meson.build                       | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/installed-tests/js/minijasmine.js b/installed-tests/js/minijasmine.js
index a1a86a2f..e99060d9 100644
--- a/installed-tests/js/minijasmine.js
+++ b/installed-tests/js/minijasmine.js
@@ -110,3 +110,10 @@ class TapReporter {
 }
 
 window._jasmineEnv.addReporter(new TapReporter());
+
+// If we're running the tests in certain JS_GC_ZEAL modes, then some will time
+// out if the CI machine is under a certain load. In that case increase the
+// default timeout.
+const gcZeal = GLib.getenv('JS_GC_ZEAL');
+if (gcZeal && (gcZeal === '2' || gcZeal.startsWith('2,') || gcZeal === '4'))
+    jasmine.DEFAULT_TIMEOUT_INTERVAL *= 5;
diff --git a/meson.build b/meson.build
index 7ec0a9fe..9e1bdc3a 100644
--- a/meson.build
+++ b/meson.build
@@ -554,16 +554,16 @@ valgrind_args = [
     '--error-exitcode=1'
 ]
 
-add_test_setup('valgrind', timeout_multiplier: 10, env: valgrind_environment,
+add_test_setup('valgrind', timeout_multiplier: 40, env: valgrind_environment,
     exe_wrapper: ['valgrind'] + valgrind_args)
 
 zeal2_environment = environment()
 zeal2_environment.set('JS_GC_ZEAL', '2,10')
-add_test_setup('extra_gc', timeout_multiplier: 10, env: zeal2_environment)
+add_test_setup('extra_gc', timeout_multiplier: 40, env: zeal2_environment)
 
 zeal4_environment = environment()
 zeal4_environment.set('JS_GC_ZEAL', '4')
-add_test_setup('pre_verify', timeout_multiplier: 2, env: zeal4_environment)
+add_test_setup('pre_verify', timeout_multiplier: 40, env: zeal4_environment)
 
 zeal11_environment = environment()
 zeal11_environment.set('JS_GC_ZEAL', '11')