From 2b9debdba989da8caeee174b902292b44afcaa4f Mon Sep 17 00:00:00 2001
From: Paulius Velesko <pvelesko@pglc.io>
Date: Mon, 12 Aug 2024 16:05:03 +0300
Subject: [PATCH 1/2] Ajust known_failures for abort,assert

---
 tests/known_failures.yaml     | 5 -----
 tests/runtime/TestAssert.bash | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/known_failures.yaml b/tests/known_failures.yaml
index 25327c506..f4ea0ec75 100644
--- a/tests/known_failures.yaml
+++ b/tests/known_failures.yaml
@@ -10,8 +10,6 @@ ANY:
     # due to NaNs appearing in the input sometimes (NaN == NaN --> false).
     Unit_hipMultiThreadStreams2: ''
     Print_Out_Attributes: 'old HIP tests + new HIP API'
-    TestAssert: ''
-    TestAssertFail: ''
     TestIndirectCall: ''
     Unit_HMM_OverSubscriptionTst: ''
     Unit_HipDeviceGetCacheConfig_Negative_Parameters: ''
@@ -400,8 +398,6 @@ ANY:
     Unit_hipUserObjectRetain_Negative: ''
     Unit_printf_flags: ''
     Unit_printf_specifier: ''
-    abort: ''
-    abort2: ''
     constant_fold_lgamma_r: ''
     cuda-simpleCallback: ''
     deviceMallocCompile: ''
@@ -409,7 +405,6 @@ ANY:
     hipStreamSemantics: ''
     syncthreadsExitedThreads: ''
   LEVEL0_GPU:
-    CatchMemLeak1: ''
     hipMemset_Unit_hipMemsetAsync_SetMemoryWithOffset_Helgrind: 'False positives from L0 helper thread'
   OPENCL_CPU:
     hipBlas-sgemm: 'GEMM SYCL exception: Backends mismatch'
diff --git a/tests/runtime/TestAssert.bash b/tests/runtime/TestAssert.bash
index db6b12912..4dd26ab3d 100644
--- a/tests/runtime/TestAssert.bash
+++ b/tests/runtime/TestAssert.bash
@@ -15,7 +15,7 @@ ${HIPCC} ${SRC_DIR}/inputs/Assert.hip -o assert
     exit 1
 }
 
-grep -c "Assert.hip:5: void k(): Device-side assertion .false [&][&] \"Hello, World!\". failed." \
+grep -c "Assert.hip:5: void k(): Device-side assertion \`false && \"Hello, World!\". failed." \
      output.log ||  {
     echo "FAIL: expected assertion error message was not found."
     exit 1

From 4ea6a6f0ed471495d387c83a1a37353152873429 Mon Sep 17 00:00:00 2001
From: Paulius Velesko <pvelesko@pglc.io>
Date: Thu, 15 Aug 2024 09:55:52 +0300
Subject: [PATCH 2/2] exclude aborts and asserts from testing

---
 scripts/unit_tests.sh     | 1 +
 tests/known_failures.yaml | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/unit_tests.sh b/scripts/unit_tests.sh
index 7c7d8cdac..cf046aa85 100755
--- a/scripts/unit_tests.sh
+++ b/scripts/unit_tests.sh
@@ -174,6 +174,7 @@ function check_tests {
   if ! grep -q "The following tests FAILED" "$file"; then
     return 0
   else
+    echo "Checking $file"
     grep -E "The following tests FAILED:" -A 1000 "$file" | sed '/^$/q' | tail -n +2
     return 1
   fi
diff --git a/tests/known_failures.yaml b/tests/known_failures.yaml
index f4ea0ec75..8aed8eec1 100644
--- a/tests/known_failures.yaml
+++ b/tests/known_failures.yaml
@@ -1,6 +1,9 @@
 TOTAL_TESTS: 1397
 ANY:
   ALL:
+    TestAssert: 'Works only on dGPU, otherwise, things being printed out of order'
+    TestAssertFail: 'Works only on dGPU, otherwise, things being printed out of order'
+    abort: 'Works only on dGPU, otherwise, things being printed out of order'
     hipcc-invalid-bitwidth-128: 'InvalidBitWidth: Invalid bit width in input: 128'
     host-math-funcs: 'host and dev results differ'
     shfl_sync: 'masks outside of 0xFFFFFFFF are not supported'
@@ -491,7 +494,7 @@ salami:
   LEVEL0_GPU:
   OPENCL_CPU:
   OPENCL_GPU:
-    Unit_hipGraphAddEventRecordNode_Functional_Simple: '' 
+    Unit_hipGraphAddEventRecordNode_Functional_Simple: ''
     Unit_hipGraphAddEventRecordNode_Functional_WithoutFlags: '' 
     Unit_hipGraphAddEventRecordNode_Functional_WithFlags: '' 
     Unit_hipGraphAddEventRecordNode_Functional_TimingDisabled: ''