test macOS abort in CI

phusion · Oct 13, 2024 · 77bf321 · 77bf321
1 parent 29fad4d
commit 77bf321
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -129,7 +129,7 @@ jobs:
           GEM_PATH="$GEM_PATH"
           PASSENGER_DUMP_WITH_CRASH_WATCH=false
           PASSENGER_FORCE_TERMINATE_ON_ABORT=true
-          gtimeout --signal KILL --verbose 30
+          gtimeout --signal KILL --verbose 60
           ../buildout/test/cxx/main
         working-directory: test
 

diff --git a/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp b/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp
@@ -26,6 +26,7 @@
 #ifndef _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_
 #define _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_
 
+#include "Exceptions.h"
 #ifdef INTELLISENSE
 	#include <Core/ApplicationPool/Pool.h>
 #endif
@@ -95,6 +96,8 @@ Group::spawnThreadRealMain(const SpawningKit::SpawnerPtr &spawner,
 			shouldFail = message->name == "Fail spawn loop iteration " + iteration;
 		}
 
+		throw new SystemException("test", 1);
+
 		ProcessPtr process;
 		ExceptionPtr exception;
 		try {

diff --git a/test/cxx/Base64DecodingTest.cpp b/test/cxx/Base64DecodingTest.cpp
@@ -1,4 +1,3 @@
-#include <Exceptions.h>
 #include <TestSupport.h>
 #include <modp_b64.h>
 
@@ -18,7 +17,6 @@ namespace tut {
 
 	/***** Valid base64 *****/
 	TEST_METHOD(1) {
-		throw new SystemException("test", 1);
 		ensure_equals(decode(""),"");
 	}
 	TEST_METHOD(2) {