jenkins: pack embedtest.exe for Windows builds (#3730)

* jenkins: pack embedtest.exe for Windows builds * make use of embedtest.exe conditional
nodejs · May 21, 2024 · 0169b18 · 0169b18
1 parent 97b592a
commit 0169b18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/jenkins/scripts/windows/ci-cleanup.cmd b/jenkins/scripts/windows/ci-cleanup.cmd
@@ -1,6 +1,7 @@
 :: Processes that can and have interfered with CI in the past
 taskkill /t /f /fi "IMAGENAME eq node.exe"
 taskkill /t /f /fi "IMAGENAME eq cctest.exe"
+taskkill /t /f /fi "IMAGENAME eq embedtest.exe"
 taskkill /t /f /fi "IMAGENAME eq run-tests.exe"
 taskkill /t /f /fi "IMAGENAME eq msbuild.exe"
 taskkill /t /f /fi "IMAGENAME eq mspdbsrv.exe"

diff --git a/jenkins/scripts/windows/node-compile-windows.cmd b/jenkins/scripts/windows/node-compile-windows.cmd
@@ -16,6 +16,7 @@ if errorlevel 1 exit /b
 
 :: Select files to pack
 set "BINARY_FILES=config.gypi icu_config.gypi Release/node.exe Release/node.lib Release/openssl-cli.exe Release/cctest.exe Release/node.pdb"
+if exist Release\embedtest.exe set "BINARY_FILES=%BINARY_FILES% Release/embedtest.exe"
 if exist Release\node_test_engine.dll set "BINARY_FILES=%BINARY_FILES% Release/node_test_engine.dll"
 if exist Release\overlapped-checker.exe set "BINARY_FILES=%BINARY_FILES% Release/overlapped-checker.exe"
 

diff --git a/jenkins/scripts/windows/test.cmd b/jenkins/scripts/windows/test.cmd
@@ -7,6 +7,7 @@ tar xzvf binary/binary.tar.gz
 if errorlevel 1 exit /b
 if exist out\Release\node.exe ln -s out/Release Release
 md5sum config.gypi icu_config.gypi Release/node.exe Release/node.lib Release/openssl-cli.exe Release/cctest.exe
+if exist Release\embedtest.exe md5sum Release/embedtest.exe
 
 :: Run the tests
 call :diagnostics Before

diff --git a/jenkins/xml/citgm-smoker.xml b/jenkins/xml/citgm-smoker.xml
@@ -362,6 +362,7 @@ $CITGM_COMMAND --nodedir=$npm_config_nodedir -v $CITGM_LOGLEVEL -x $PWD/report.x
         <hudson.tasks.BatchFile>
           <command>TASKKILL /F /IM node.exe /T || TRUE&#xd;
 TASKKILL /F /IM cctest.exe /T || TRUE&#xd;
+TASKKILL /F /IM embedtest.exe /T || TRUE&#xd;
 TASKKILL /F /IM run-tests.exe /T || TRUE&#xd;
 &#xd;
 :: smoker dir is only for the report, Release is used to run because there&apos;s no make install&#xd;
@@ -432,6 +433,7 @@ echo on&#xd;
 &#xd;
 TASKKILL /F /IM node.exe /T || TRUE&#xd;
 TASKKILL /F /IM cctest.exe /T || TRUE&#xd;
+TASKKILL /F /IM embedtest.exe /T || TRUE&#xd;
 TASKKILL /F /IM run-tests.exe /T || TRUE&#xd;
 </command>
         </hudson.tasks.BatchFile>