fix test script

Author: max-charlamb

src/SOS/Strike/strike.cpp

@@ -4408,10 +4408,9 @@ HRESULT PrintThreadsFromThreadStore(BOOL bMiniDump, BOOL bPrintLiveThreadsOnly)
         }
 
         BOOL bSwitchedOutFiber = Thread.osThreadId == SWITCHED_OUT_FIBER_OSID;
+        ULONG id = 0;
         if (!IsKernelDebugger())
         {
-            ULONG id = 0;
-
             if (bSwitchedOutFiber)
             {
                 table.WriteColumn(0, "<<<< ");
@@ -4457,10 +4456,17 @@ HRESULT PrintThreadsFromThreadStore(BOOL bMiniDump, BOOL bPrintLiveThreadsOnly)
 #ifndef FEATURE_PAL
         DWORD_PTR OleTlsDataAddr;
         ULONG64 teb = 0;
-        IDebuggerServices* debuggerServices = GetDebuggerServices();
-        if (IsWindowsTarget() && !bSwitchedOutFiber
-                && debuggerServices != nullptr
-                && SUCCEEDED(debuggerServices->GetThreadTeb(Thread.osThreadId, &teb)) && teb != 0
+        if (IsWindowsTarget() && !bSwitchedOutFiber && id != 0)
+        {
+            ULONG curId;
+            if (SUCCEEDED(g_ExtSystem->GetCurrentThreadId(&curId)) &&
+                SUCCEEDED(g_ExtSystem->SetCurrentThreadId(id)))
+            {
+                g_ExtSystem->GetCurrentThreadTeb(&teb);
+                g_ExtSystem->SetCurrentThreadId(curId);
+            }
+        }
+        if (teb != 0
                 && SafeReadMemory(TO_TADDR(teb + offsetof(TEB, ReservedForOle)),
                             &OleTlsDataAddr,
                             sizeof(OleTlsDataAddr), NULL) && OleTlsDataAddr != 0)

src/tests/SOS.UnitTests/Debuggees/ThreadApartment/ThreadApartment.cs

@@ -36,15 +36,8 @@ private static void Main()
         s_staReady.Wait();
         s_mtaReady.Wait();
 
-        // If a debugger is attached, break into it. Otherwise just wait.
-        if (Debugger.IsAttached)
-        {
-            Debugger.Break();
-        }
-        else
-        {
-            Console.WriteLine("Ready for dump capture");
-            Thread.Sleep(Timeout.Infinite);
-        }
+        Debugger.Break();
+
+        throw new Exception("ThreadApartment test complete");
     }
 }

src/tests/SOS.UnitTests/Scripts/ThreadApartment.script

@@ -3,6 +3,8 @@
 # This test is Windows-only since apartment state is a Windows COM concept.
 #
 
+CONTINUE
+
 LOADSOS
 
 # Verify that clrthreads shows the apartment state column with STA and MTA values.