Merge 'master' into 'amd-master'

Change-Id: Ia644de6ad38b78157a8708e3f3c6bbf404388af1
ROCm · Apr 21, 2022 · 472c361 · 472c361
2 parents 3aef806 + 1e22398
commit 472c361
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/share/rocm/cmake/header_template.h.in b/share/rocm/cmake/header_template.h.in
@@ -11,7 +11,7 @@
 #if defined(_MSC_VER)
 #pragma message(": warning:This file is deprecated. Use the header file from @header_location@ by using #include <@correct_include@>")
 #elif defined(__GNUC__)
-#warning "This file is deprecated. Use the header file from @header_location@ by using #include <@correct_include@>"
+#pragma message(": warning : This file is deprecated. Use the header file from @header_location@ by using #include <@correct_include@>")
 #endif
 #include "@file_rel_path@"
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -20,6 +20,10 @@ foreach(TEST ${PASS_TESTS})
 endforeach()
 
 file(GLOB FAIL_TESTS fail/*.cmake)
+# Disable wrapper fail test, as the warning is changed to message
+# This is temporary and will be enabled back later when the behavior is reverted
+list(FILTER FAIL_TESTS EXCLUDE REGEX ".*wrapper\.cmake$")
+
 foreach(TEST ${FAIL_TESTS})
     get_filename_component(NAME ${TEST} NAME_WE)
     create_test(fail-${NAME} ${TEST})