Add env variable to explicitly disable logger callback sink as it interferes with some e2e tests

Author: martygrant

sycl/source/detail/ur.cpp

@@ -230,8 +230,11 @@ static void initializeAdapters(std::vector<AdapterPtr> &Adapters,
     auto syclBackend = UrToSyclBackend(adapterBackend);
     Adapters.emplace_back(std::make_shared<Adapter>(UrAdapter, syclBackend));
 
-    CHECK_UR_SUCCESS(adapterSetLoggerCallback(UrAdapter, urLoggerCallback,
-                                              nullptr, UR_LOGGER_LEVEL_INFO));
+    const char *env_value = std::getenv("UR_LOG_CALLBACK");
+    if (env_value == nullptr || std::string(env_value) != "disabled") {
+      CHECK_UR_SUCCESS(adapterSetLoggerCallback(UrAdapter, urLoggerCallback,
+                                                nullptr, UR_LOGGER_LEVEL_INFO));
+    }
   }
 
 #ifdef XPTI_ENABLE_INSTRUMENTATION

sycl/test-e2e/External/README.md

@@ -76,4 +76,3 @@ cmake \
 make check-sycl-e2e
 
 ```
-

sycl/test-e2e/lit.cfg.py

@@ -168,6 +168,8 @@
             lit_config.note("\tUnset " + var)
             llvm_config.with_environment(var, "")
 
+# Disable the UR logger callback sink during test runs as output to SYCL RT can interfere with some tests relying on standard input/output
+llvm_config.with_environment("UR_LOG_CALLBACK", "disabled")
 
 # Temporarily modify environment to be the same that we use when running tests
 class test_env:

sycl/test/Unit/lit.cfg.py

@@ -95,3 +95,6 @@ def find_shlibpath_var():
 
 config.environment["SYCL_CACHE_DIR"] = config.llvm_obj_root + "/sycl_cache"
 lit_config.note("SYCL cache directory: {}".format(config.environment["SYCL_CACHE_DIR"]))
+
+# Disable the UR logger callback sink during test runs as output to SYCL RT can interfere with some tests relying on standard input/output
+config.environment["UR_LOG_CALLBACK"] = "disabled"

sycl/test/lit.cfg.py

@@ -186,6 +186,9 @@
         )
     )
 
+# Disable the UR logger callback sink during test runs as output to SYCL RT can interfere with some tests relying on standard input/output
+llvm_config.with_environment("UR_LOG_CALLBACK", "disabled")
+
 # Dump-only tests do not have clang available
 if not dump_only_tests:
     llvm_config.use_clang(additional_flags=additional_flags)