restoring

sycl/unittests/SYCL2020/KernelBundle.cpp

@@ -487,14 +487,6 @@ ur_result_t redefinedDevicePartitionAfter(void *pParams) {
   return UR_RESULT_SUCCESS;
 }
 
-#ifndef _WIN32
-// While the Mock object is created anew for each test, the SYCL
-// GlobalHandler is not. It is the same across all tests in a
-// single executable.  Some of the mock callbacks modify the
-// global platforms/devices. On Linux, we can clear these
-// changes by faking shutdown. But on Windows we can't do that.
-// To avoid conflicts,  this test is being skipped on Windows.
-// It would pass if placed in its own suite.
 TEST(KernelBundle, DescendentDevice) {
   // Mock a non-OpenCL adapter since use of descendent devices of context
   // members is not supported there yet.
@@ -529,7 +521,6 @@ TEST(KernelBundle, DescendentDevice) {
 
   EXPECT_EQ(KernelBundle, RetKernelBundle);
 }
-#endif
 
 TEST(KernelBundle, CheckIfBundleHasIncompatibleKernel) {
   sycl::unittest::UrMock<> Mock;

sycl/unittests/program_manager/DynamicLinking/DynamicLinking.cpp

@@ -253,13 +253,6 @@ TEST(DynamicLinking, AheadOfTime) {
             AOT_CASE_PRG_NATIVE * AOT_CASE_PRG_DEP_NATIVE);
 }
 
-#ifndef _WIN32
-// The 'setupRuntimeLinkingMock' used by other tests results in
-// changes to the global platforms/devices that will result
-// in a test failure if not cleared. On Linux, the Mock's destructor
-// fakes shutdown to clear them. But on Windows we can't
-// do that hack. So we skip this test. It would pass
-// if placed in its own test suite.
 TEST(DynamicLinking, AheadOfTimeUnsupported) {
   try {
     sycl::unittest::UrMock<sycl::backend::ext_oneapi_level_zero> Mock;
@@ -273,7 +266,6 @@ TEST(DynamicLinking, AheadOfTimeUnsupported) {
                            "unsupported for the backend");
   }
 }
-#endif
 
 static ur_result_t redefined_urProgramCompileExp(void *pParams) {
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;