diff --git a/sycl/test-e2e/Adapters/dll-detach-order.cpp b/sycl/test-e2e/Adapters/dll-detach-order.cpp index 220c753c8e2d0..41a310206156d 100644 --- a/sycl/test-e2e/Adapters/dll-detach-order.cpp +++ b/sycl/test-e2e/Adapters/dll-detach-order.cpp @@ -1,5 +1,5 @@ // REQUIRES: windows -// RUN: env SYCL_UR_TRACE=-1 %{run-unfiltered-devices} sycl-ls | FileCheck %s +// RUN: env SYCL_UR_TRACE=-1 %{run-unfiltered-devices} sycl-ls 2>&1 | FileCheck %s // ensure that the adapters are detached AFTER urLoaderTearDown is done // executing diff --git a/unified-runtime/source/adapters/level_zero/adapter.cpp b/unified-runtime/source/adapters/level_zero/adapter.cpp index c70012ceeed74..1952da504359e 100644 --- a/unified-runtime/source/adapters/level_zero/adapter.cpp +++ b/unified-runtime/source/adapters/level_zero/adapter.cpp @@ -47,12 +47,6 @@ class ur_legacy_sink : public logger::Sink { const std::string &msg) override { fprintf(stderr, "%s", msg.c_str()); } - - ~ur_legacy_sink() { -#if defined(_WIN32) - logger::isTearDowned = true; -#endif - }; }; // Find the corresponding ZesDevice Handle for a given ZeDevice diff --git a/unified-runtime/source/common/logger/ur_sinks.hpp b/unified-runtime/source/common/logger/ur_sinks.hpp index c15e8b2cb0bd2..984b6a4c2e586 100644 --- a/unified-runtime/source/common/logger/ur_sinks.hpp +++ b/unified-runtime/source/common/logger/ur_sinks.hpp @@ -53,7 +53,7 @@ class Sink { // using thier own sink class that inherit from logger::Sink. #if defined(_WIN32) if (isTearDowned) { - std::cerr << message << "\n"; + std::cerr << message; } else { print(level, message); } @@ -193,7 +193,11 @@ class StderrSink : public Sink { this->flush_level = flush_lvl; } - ~StderrSink() = default; + ~StderrSink() { +#if defined(_WIN32) + logger::isTearDowned = true; +#endif + } }; class FileSink : public Sink {