Skip to content

Commit eba5f9c

Browse files
committed
Merge bitcoin#32403: test: remove Boost SIGCHLD workaround.
3add6ab test: remove Boost SIGCHLD workaround. (fanquake) Pull request description: The related code was removed from Boost in boostorg/test@2e3bd10. ACKs for top commit: achow101: ACK 3add6ab laanwj: ACK 3add6ab hebasto: ACK 3add6ab, I have reviewed the code and it looks OK. mabu44: ACK 3add6ab Tree-SHA512: a0db2bb4e6a476c920a97183bd807e800d935114ff28f8802373a08b5330df42a9be953e7ea6e3c09f2ed45175f60c26c33bb4e25010269e6e491f12867ba008
2 parents 5b8046a + 3add6ab commit eba5f9c

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/test/util_tests.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include <sys/types.h>
4141

4242
#ifndef WIN32
43-
#include <signal.h>
4443
#include <sys/wait.h>
4544
#endif
4645

@@ -1198,11 +1197,6 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
11981197
fs::path dirname = m_args.GetDataDirBase() / "lock_dir";
11991198
const fs::path lockname = ".lock";
12001199
#ifndef WIN32
1201-
// Revert SIGCHLD to default, otherwise boost.test will catch and fail on
1202-
// it: there is BOOST_TEST_IGNORE_SIGCHLD but that only works when defined
1203-
// at build-time of the boost library
1204-
void (*old_handler)(int) = signal(SIGCHLD, SIG_DFL);
1205-
12061200
// Fork another process for testing before creating the lock, so that we
12071201
// won't fork while holding the lock (which might be undefined, and is not
12081202
// relevant as test case as that is avoided with -daemonize).
@@ -1280,8 +1274,6 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
12801274
BOOST_CHECK_EQUAL(processstatus, 0);
12811275
BOOST_CHECK_EQUAL(util::LockDirectory(dirname, lockname, true), util::LockResult::Success);
12821276

1283-
// Restore SIGCHLD
1284-
signal(SIGCHLD, old_handler);
12851277
BOOST_CHECK_EQUAL(close(fd[1]), 0); // Close our side of the socketpair
12861278
#endif
12871279
// Clean up

0 commit comments

Comments
 (0)