Merge commit '190562e8c65c9872c5c22391400931da8e4b5dae' into develop

projects/rocprofiler-systems/tests/rocprof-sys-testing.cmake

@@ -532,7 +532,7 @@ function(ROCPROFILER_SYSTEMS_ADD_TEST)
     cmake_parse_arguments(
         TEST
         "SKIP_BASELINE;SKIP_SAMPLING;SKIP_REWRITE;SKIP_RUNTIME"
-        "NAME;TARGET;MPI;GPU;NUM_PROCS;SAMPLING_TIMEOUT;REWRITE_TIMEOUT;RUNTIME_TIMEOUT"
+        "NAME;TARGET;MPI;GPU;NUM_PROCS;SAMPLING_TIMEOUT;REWRITE_TIMEOUT;RUNTIME_TIMEOUT;WILL_FAIL;DISABLED"
         "${_KWARGS}"
         ${ARGN}
     )
@@ -584,6 +584,14 @@ function(ROCPROFILER_SYSTEMS_ADD_TEST)
         set(TEST_SAMPLING_TIMEOUT 120)
     endif()
 
+    if(NOT TEST_DISABLED)
+        set(TEST_DISABLED OFF)
+    endif()
+
+    if(NOT TEST_WILL_FAIL)
+        set(TEST_WILL_FAIL OFF)
+    endif()
+
     if(NOT DEFINED TEST_ENVIRONMENT OR "${TEST_ENVIRONMENT}" STREQUAL "")
         set(TEST_ENVIRONMENT "${_test_environment}")
     endif()
@@ -777,6 +785,8 @@ function(ROCPROFILER_SYSTEMS_ADD_TEST)
                         PASS_REGULAR_EXPRESSION "${${_PASS_REGEX}}"
                         FAIL_REGULAR_EXPRESSION "${${_FAIL_REGEX}}"
                         SKIP_REGULAR_EXPRESSION "${${_SKIP_REGEX}}"
+                        WILL_FAIL ${TEST_WILL_FAIL}
+                        DISABLED ${TEST_DISABLED}
                         ${_props}
                 )
             endif()