[Bug gdb/29549] [gdb/selftest] selftest run_on_main_thread + ^C: terminate called without an active exception

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=29549

--- Comment #2 from Tom de Vries <vries at gcc dot gnu.org> ---
Tentative patch:
...
diff --git a/gdb/unittests/main-thread-selftests.c
b/gdb/unittests/main-thread-selftests.c

index 7e1a30d7e80..8ab0c445d42 100644
--- a/gdb/unittests/main-thread-selftests.c
+++ b/gdb/unittests/main-thread-selftests.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/block-signals.h"
+#include "gdbsupport/scope-exit.h"
 #include "run-on-main-thread.h"
 #include "gdbsupport/event-loop.h"
 #if CXX_STD_THREAD
@@ -52,6 +53,11 @@ run_tests ()
   {
     gdb::block_signals blocker;

+    SCOPE_EXIT
+      {
+       if (thread.joinable ())
+         thread.join ();
+      };
     thread = std::thread (set_done);
   }

@@ -61,8 +67,6 @@ run_tests ()
   /* Actually the test will just hang, but we want to test
      something.  */
   SELF_CHECK (done);
-
-  thread.join ();
 }

 #endif
...

-- 
You are receiving this mail because:
You are on the CC list for the bug.