From 0719310798e116dc8705c2ae449d034612f723ad Mon Sep 17 00:00:00 2001
From: Aaron Greig <aaron.greig@codeplay.com>
Date: Tue, 18 Jul 2023 17:30:54 +0100
Subject: [PATCH] Enable validation on conformance tests for platform.

Also necessitates splitting urInit/urTearDown into their own suite due
to how they currently work WRT global state.
---
 test/conformance/CMakeLists.txt                       | 1 +
 test/conformance/platform/CMakeLists.txt              | 4 +---
 test/conformance/platform/fixtures.h                  | 7 ++++++-
 test/conformance/runtime/CMakeLists.txt               | 8 ++++++++
 test/conformance/{platform => runtime}/urInit.cpp     | 0
 test/conformance/{platform => runtime}/urTearDown.cpp | 0
 6 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 test/conformance/runtime/CMakeLists.txt
 rename test/conformance/{platform => runtime}/urInit.cpp (100%)
 rename test/conformance/{platform => runtime}/urTearDown.cpp (100%)

diff --git a/test/conformance/CMakeLists.txt b/test/conformance/CMakeLists.txt
index 2b2c5238c6..8506afaa16 100644
--- a/test/conformance/CMakeLists.txt
+++ b/test/conformance/CMakeLists.txt
@@ -46,6 +46,7 @@ endfunction()
 
 add_subdirectory(testing)
 
+add_subdirectory(runtime)
 add_subdirectory(platform)
 add_subdirectory(device)
 add_subdirectory(context)
diff --git a/test/conformance/platform/CMakeLists.txt b/test/conformance/platform/CMakeLists.txt
index 92e95018e4..3a9483e2a8 100644
--- a/test/conformance/platform/CMakeLists.txt
+++ b/test/conformance/platform/CMakeLists.txt
@@ -4,12 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 add_conformance_test(platform
-    urInit.cpp
     urPlatformCreateWithNativeHandle.cpp
     urPlatformGet.cpp
     urPlatformGetApiVersion.cpp
     urPlatformGetBackendOption.cpp
     urPlatformGetInfo.cpp
     urPlatformGetLastError.cpp
-    urPlatformGetNativeHandle.cpp
-    urTearDown.cpp)
+    urPlatformGetNativeHandle.cpp)
diff --git a/test/conformance/platform/fixtures.h b/test/conformance/platform/fixtures.h
index 038d8f9ff4..1558d8d1b3 100644
--- a/test/conformance/platform/fixtures.h
+++ b/test/conformance/platform/fixtures.h
@@ -14,7 +14,12 @@ struct urTest : ::testing::Test {
 
     void SetUp() override {
         ur_device_init_flags_t device_flags = 0;
-        ASSERT_SUCCESS(urInit(device_flags, nullptr));
+        ur_loader_config_handle_t config;
+        ASSERT_SUCCESS(urLoaderConfigCreate(&config));
+        ASSERT_SUCCESS(
+            urLoaderConfigEnableLayer(config, "UR_LAYER_FULL_VALIDATION"));
+        ASSERT_SUCCESS(urInit(device_flags, config));
+        ASSERT_SUCCESS(urLoaderConfigRelease(config));
     }
 
     void TearDown() override {
diff --git a/test/conformance/runtime/CMakeLists.txt b/test/conformance/runtime/CMakeLists.txt
new file mode 100644
index 0000000000..ab0adc8818
--- /dev/null
+++ b/test/conformance/runtime/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (C) 2022 Intel Corporation
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+add_conformance_test(runtime
+    urInit.cpp
+    urTearDown.cpp)
diff --git a/test/conformance/platform/urInit.cpp b/test/conformance/runtime/urInit.cpp
similarity index 100%
rename from test/conformance/platform/urInit.cpp
rename to test/conformance/runtime/urInit.cpp
diff --git a/test/conformance/platform/urTearDown.cpp b/test/conformance/runtime/urTearDown.cpp
similarity index 100%
rename from test/conformance/platform/urTearDown.cpp
rename to test/conformance/runtime/urTearDown.cpp