Index: lldb/unittests/tools/lldb-server/tests/LLGSTest.cpp =================================================================== --- lldb/unittests/tools/lldb-server/tests/LLGSTest.cpp +++ lldb/unittests/tools/lldb-server/tests/LLGSTest.cpp @@ -22,11 +22,16 @@ ASSERT_THAT_EXPECTED(ClientOr, Succeeded()); auto &Client = **ClientOr; +#if defined(__NetBSD__) + // XFAIL: this test currently fails on NetBSD + ASSERT_THAT_ERROR(Client.ContinueAll(), Failed()); +#else ASSERT_THAT_ERROR(Client.ContinueAll(), Succeeded()); ASSERT_THAT_EXPECTED( Client.GetLatestStopReplyAs(), HasValue(testing::Property(&StopReply::getKind, WaitStatus{WaitStatus::Exit, 0}))); +#endif } TEST_F(TestBase, DS_TEST(DebugserverEnv)) { Index: lldb/unittests/tools/lldb-server/tests/ThreadIdsInJstopinfoTest.cpp =================================================================== --- lldb/unittests/tools/lldb-server/tests/ThreadIdsInJstopinfoTest.cpp +++ lldb/unittests/tools/lldb-server/tests/ThreadIdsInJstopinfoTest.cpp @@ -29,6 +29,10 @@ Succeeded()); ASSERT_THAT_ERROR(Client->ListThreadsInStopReply(), Succeeded()); +#if defined(__NetBSD__) + // XFAIL: this test currently fails on NetBSD + ASSERT_THAT_ERROR(Client->ContinueAll(), Failed()); +#else ASSERT_THAT_ERROR(Client->ContinueAll(), Succeeded()); unsigned int pc_reg = Client->GetPcRegisterId(); ASSERT_NE(pc_reg, UINT_MAX); @@ -50,4 +54,5 @@ EXPECT_THAT(thread_infos[tid].ReadRegister(pc_reg), Pointee(Eq(stop_reply_pc.second))); } +#endif }