adapt test-ci build target for buildd

Forwarded: not-needed
Reviewed-By: Xavier Guimard <yadd@debian.org>
Last-Update: 2020-02-09

* log to stdout
* increase timeout multipliers

Gbp-Pq: Topic build
Gbp-Pq: Name test_ci.patch

diff --git a/Makefile b/Makefile
index 0e87de5b41dfc97caeed4a256c262f34f09809b3..a74b7849337664942579a68f4eaef5f3bbbb7ed2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -558,7 +558,7 @@ test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-nat
 # This target should not use a native compiler at all
 # Related CI job: node-test-commit-arm-fanned
 test-ci-js: | clear-stalled
-       $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
+       $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap \
                --mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
                --skip-tests=$(CI_SKIP_TESTS) \
                $(TEST_CI_ARGS) $(CI_JS_SUITES)

diff --git a/test/common/index.js b/test/common/index.js
index c36643203746cd44280c871a7f2b8c9c2a9c0cf6..5af30b96d8568f2c701b5682b867f0de6e78eed5 100644 (file)
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -278,16 +278,15 @@ const pwdCommand = isWindows ?
 
 function platformTimeout(ms) {
   const multipliers = typeof ms === 'bigint' ?
-    { two: 2n, four: 4n, seven: 7n } : { two: 2, four: 4, seven: 7 };
+    { fast: 2n, slow: 4n } : { fast: 3, slow: 5 };
+ 
+  if (process.arch.startsWith('arm') || process.arch.startsWith('mips') || process.arch.startsWith('riscv'))
+    ms = multipliers.slow * ms;
+  else
+    ms = multipliers.fast * ms;
 
   if (process.features.debug)
-    ms = multipliers.two * ms;
-
-  if (exports.isAIX || exports.isIBMi)
-    return multipliers.two * ms; // Default localhost speed is slower on AIX
-
-  if (isPi)
-    return multipliers.two * ms;  // Raspberry Pi devices
+    ms = multipliers.slow * ms;
 
   return ms;
 }

diff --git a/tools/test.py b/tools/test.py
index 9d7838d7c0110a08d14c9b9e4d5d7e2690f97e9b..79417f6bbcd806a4fd4207c654b7f41c68ea283d 100755 (executable)
--- a/tools/test.py
+++ b/tools/test.py
@@ -1762,7 +1762,8 @@ def Main():
 
   def should_keep(case):
     if any((s in case.file) for s in options.skip_tests):
-      return False
+      case.outcomes.add(FLAKY)
+      return True
     elif SKIP in case.outcomes:
       return False
     elif (options.flaky_tests == SKIP) and (set([SLOW, FLAKY]) & case.outcomes):