Prevent accessing devices that was deleted on lit config

intel · Sep 25, 2024 · 96d1736 · 96d1736
1 parent 36690f4
commit 96d1736
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sycl/source/detail/global_handler.cpp b/sycl/source/detail/global_handler.cpp
@@ -329,7 +329,7 @@ void shutdown_early() {
 void shutdown_win() {
   shutdown_early();
   GlobalHandler *&Handler = GlobalHandler::getInstancePtr();
-  Handler->unloadPlugins();
+  Handler->unloadAdapters();
 }
 #else
 void shutdown_late() {
@@ -384,6 +384,7 @@ extern "C" __SYCL_EXPORT BOOL WINAPI DllMain(HINSTANCE hinstDLL,
 
     try {
       shutdown_win();
+      exit(0);
     } catch (std::exception &e) {
       __SYCL_REPORT_EXCEPTION_TO_STREAM("exception in shutdown_win", e);
       return FALSE;

diff --git a/sycl/test-e2e/format.py b/sycl/test-e2e/format.py
@@ -278,7 +278,7 @@ def get_extra_env(sycl_devices):
             test, litConfig, useExternalSh, script, tmpBase
         )
 
-        if len(devices_for_test) > 1:
+        if len(devices_for_test) != 1:
             return result
 
         # Single device - might be an XFAIL.