Tests: Update thread tests and make them pass
The existing tests have only mildly changed, and there is another test for joining dead non-detached threads.
This commit is contained in:
parent
2fcb713037
commit
5b335e7fba
Notes:
sideshowbarker
2024-07-17 07:48:42 +09:00
Author: https://github.com/kleinesfilmroellchen Commit: https://github.com/SerenityOS/serenity/commit/5b335e7fba Pull-request: https://github.com/SerenityOS/serenity/pull/16011 Reviewed-by: https://github.com/ADKaster ✅
1 changed files with 25 additions and 6 deletions
|
@ -8,9 +8,6 @@
|
||||||
#include <LibThreading/Thread.h>
|
#include <LibThreading/Thread.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
// FIXME: Enable these tests once they work reliably.
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
TEST_CASE(threads_can_detach)
|
TEST_CASE(threads_can_detach)
|
||||||
{
|
{
|
||||||
int should_be_42 = 0;
|
int should_be_42 = 0;
|
||||||
|
@ -29,10 +26,32 @@ TEST_CASE(threads_can_detach)
|
||||||
|
|
||||||
TEST_CASE(joining_detached_thread_errors)
|
TEST_CASE(joining_detached_thread_errors)
|
||||||
{
|
{
|
||||||
auto thread = Threading::Thread::construct([]() { return 0; });
|
Atomic<bool> should_exit { false };
|
||||||
|
auto thread = Threading::Thread::construct([&]() {
|
||||||
|
while (!should_exit.load())
|
||||||
|
usleep(10 * 1000);
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
thread->start();
|
thread->start();
|
||||||
thread->detach();
|
thread->detach();
|
||||||
|
|
||||||
EXPECT(thread->join().is_error());
|
// Because of how the crash test forks and removes the thread, we can't use that to verify that join() crashes. Instead, we check the join crash condition ourselves.
|
||||||
|
EXPECT(!thread->needs_to_be_joined());
|
||||||
|
|
||||||
|
// FIXME: Dropping a running thread crashes because of the Function destructor. For now, force the detached thread to exit.
|
||||||
|
should_exit.store(true);
|
||||||
|
usleep(20 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_CASE(join_dead_thread)
|
||||||
|
{
|
||||||
|
auto thread = Threading::Thread::construct([&]() { return 0 /*nullptr*/; });
|
||||||
|
thread->start();
|
||||||
|
// The thread should have exited by then.
|
||||||
|
usleep(40 * 1000);
|
||||||
|
|
||||||
|
auto join_result = thread->join<int*>();
|
||||||
|
|
||||||
|
EXPECT(!join_result.is_error());
|
||||||
|
EXPECT_EQ(join_result.value(), static_cast<int*>(0));
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue