From 2853b76e202e2549a8c02ed9f46621abcb76f392 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Thu, 9 Jul 2020 22:06:04 -0700
Subject: [PATCH] build: add pummel tests to ci runs

PR-URL: https://github.com/nodejs/node/pull/34289
Reviewed-By: Richard Lau <rlau@redhat.com>
---
 Makefile      | 2 +-
 tools/test.py | 9 ++++++---
 vcbuild.bat   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 697ce9bb7505da..b988994d286fc3 100644
--- a/Makefile
+++ b/Makefile
@@ -478,7 +478,7 @@ JS_SUITES ?= default
 NATIVE_SUITES ?= addons js-native-api node-api
 # CI_* variables should be kept synchronized with the ones in vcbuild.bat
 CI_NATIVE_SUITES ?= $(NATIVE_SUITES) benchmark
-CI_JS_SUITES ?= $(JS_SUITES)
+CI_JS_SUITES ?= $(JS_SUITES) pummel
 ifeq ($(node_use_openssl), false)
 	CI_DOC := doctool
 else
diff --git a/tools/test.py b/tools/test.py
index 2884bf44bd1dbe..cdeb40d59cda78 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -574,7 +574,7 @@ def RunCommand(self, command, env):
     full_command = self.context.processor(command)
     output = Execute(full_command,
                      self.context,
-                     self.context.GetTimeout(self.mode),
+                     self.context.GetTimeout(self.mode, self.config.section),
                      env,
                      disable_core_files = self.disable_core_files)
     return TestOutput(self,
@@ -940,8 +940,11 @@ def GetVm(self, arch, mode):
 
     return name
 
-  def GetTimeout(self, mode):
-    return self.timeout * TIMEOUT_SCALEFACTOR[ARCH_GUESS or 'ia32'][mode]
+  def GetTimeout(self, mode, section=''):
+    timeout = self.timeout * TIMEOUT_SCALEFACTOR[ARCH_GUESS or 'ia32'][mode]
+    if section == 'pummel':
+      timeout = timeout * 4
+    return timeout
 
 def RunTestCases(cases_to_run, progress, tasks, flaky_tests_mode):
   progress = PROGRESS_INDICATORS[progress](cases_to_run, flaky_tests_mode)
diff --git a/vcbuild.bat b/vcbuild.bat
index bf044bcdf7d50f..9e54fabd41681e 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -19,7 +19,7 @@ set JS_SUITES=default
 set NATIVE_SUITES=addons js-native-api node-api
 @rem CI_* variables should be kept synchronized with the ones in Makefile
 set "CI_NATIVE_SUITES=%NATIVE_SUITES% benchmark"
-set "CI_JS_SUITES=%JS_SUITES%"
+set "CI_JS_SUITES=%JS_SUITES% pummel"
 set CI_DOC=doctool
 @rem Same as the test-ci target in Makefile
 set "common_test_suites=%JS_SUITES% %NATIVE_SUITES%&set build_addons=1&set build_js_native_api_tests=1&set build_node_api_tests=1"