Wait for spawned fork-test to avoid race condition

Each spawned testcase is now exited to avoid running the tests multiple times.
This fixes a race condition seen with a newer GNU libc version.

Signed-off-by: Björn Svensson <[email protected]>

Author: bjosv

src/lib/test/ForkTests.cpp

@@ -40,6 +40,7 @@
 #include "osmutex.h"
 
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ForkTests);
@@ -64,6 +65,7 @@ void ForkTests::testFork()
 {
 	CK_RV rv;
 	pid_t pid;
+	int status;
 
 	// Just make sure that we finalize any previous failed tests
 	CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
@@ -78,12 +80,20 @@ void ForkTests::testFork()
 			CPPUNIT_FAIL("Fork failed");
 			break;
 		case 0:
+			/* For the child, the token is expected to still be initialized. */
 			rv = CRYPTOKI_F_PTR( C_Initialize(NULL_PTR) );
 			CPPUNIT_ASSERT(rv == CKR_CRYPTOKI_ALREADY_INITIALIZED);
+			rv = CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
+			CPPUNIT_ASSERT(rv == CKR_OK);
+			_exit(EXIT_SUCCESS);
 			break;
 		default:
+			/* For the parent, the token is expected to still be initialized. */
 			rv = CRYPTOKI_F_PTR( C_Initialize(NULL_PTR) );
 			CPPUNIT_ASSERT(rv == CKR_CRYPTOKI_ALREADY_INITIALIZED);
+			/* Wait for the child process to finish and check its status. */
+			CPPUNIT_ASSERT(waitpid(pid, &status, 0) == pid);
+			CPPUNIT_ASSERT(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
 			break;
 	}
 
@@ -95,6 +105,7 @@ void ForkTests::testResetOnFork()
 {
 	CK_RV rv;
 	pid_t pid;
+	int status;
 
 	// Just make sure that we finalize any previous failed tests
 	CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
@@ -118,11 +129,17 @@ void ForkTests::testResetOnFork()
 			/* For the child, the token is expected to be reset on fork */
 			rv = CRYPTOKI_F_PTR( C_Initialize(NULL_PTR) );
 			CPPUNIT_ASSERT(rv == CKR_OK);
+			rv = CRYPTOKI_F_PTR( C_Finalize(NULL_PTR) );
+			CPPUNIT_ASSERT(rv == CKR_OK);
+			_exit(EXIT_SUCCESS);
 			break;
 		default:
 			/* For the parent, the token is expected to be still initialized */
 			rv = CRYPTOKI_F_PTR( C_Initialize(NULL_PTR) );
 			CPPUNIT_ASSERT(rv == CKR_CRYPTOKI_ALREADY_INITIALIZED);
+			/* Wait for the child process to finish and check its status. */
+			CPPUNIT_ASSERT(waitpid(pid, &status, 0) == pid);
+			CPPUNIT_ASSERT(WIFEXITED(status) && WEXITSTATUS(status) == EXIT_SUCCESS);
 			break;
 	}