From c90f064fa9fa24a2841fda52ccde148990a0857d Mon Sep 17 00:00:00 2001
From: Georgi Mirazchiyski <georgi.mirazchiyski@codeplay.com>
Date: Thu, 30 Jan 2025 15:41:48 +0000
Subject: [PATCH] Apply a few test fixes due to changes lost on rebase

---
 .../bindless_images/array/read_write_unsampled_array.cpp     | 1 +
 sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp    | 2 ++
 .../bindless_images/user_types/user_types_common.hpp         | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
index 7f0db5936adce..2d82d917d7ca5 100644
--- a/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
+++ b/sycl/test-e2e/bindless_images/array/read_write_unsampled_array.cpp
@@ -1,3 +1,4 @@
+// REQUIRES: linux
 // REQUIRES: aspect-ext_oneapi_image_array
 
 // RUN: %{build} -o %t.out
diff --git a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
index 2b63336c907f5..7070e1c49e823 100644
--- a/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
+++ b/sycl/test-e2e/bindless_images/cubemap/cubemap_sampled.cpp
@@ -1,4 +1,6 @@
+// REQUIRES: aspect-ext_oneapi_cubemap
 // REQUIRES: aspect-ext_oneapi_cubemap_seamless_filtering
+// REQUIRES: build-and-run-mode
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/user_types/user_types_common.hpp b/sycl/test-e2e/bindless_images/user_types/user_types_common.hpp
index fde9860d1c03c..0a233c2a5cb48 100644
--- a/sycl/test-e2e/bindless_images/user_types/user_types_common.hpp
+++ b/sycl/test-e2e/bindless_images/user_types/user_types_common.hpp
@@ -1,12 +1,15 @@
 // This file includes common definitions and functions that are shared between
 // multiple tests that use user-defined types
 
+#ifdef VERBOSE_PRINT
 #include <iostream>
+#endif
+#include <string>
 #include <sycl/detail/core.hpp>
 
 #include <sycl/ext/oneapi/bindless_images.hpp>
 
-void printTestName(std::string name) {
+static inline void printTestName([[maybe_unused]] std::string name) {
 #ifdef VERBOSE_PRINT
   std::cout << name << std::endl;
 #endif