From 2b4d17078a928eaf5d1704588e4dfd0b2bf349f2 Mon Sep 17 00:00:00 2001
From: andmar-amd <andrew.martin@amd.com>
Date: Wed, 19 Nov 2025 17:14:40 -0500
Subject: [PATCH] Improve test script logic and error handling (#1424)

- Fix exclude+gtest_filter logic
 - Improve error handling when detecting upstream branches
---
 .../libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh b/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh
index 5e9153f8d6..d361a00477 100755
--- a/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh
+++ b/projects/rocr-runtime/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh
@@ -140,7 +140,7 @@ getFilter() {
     esac
 
     # Check if the loaded driver is upstream (in-box) or DKMS
-    rdma_get_pages_func=$(cat /proc/kallsyms | grep rdma_get_pages)
+    rdma_get_pages_func=$(cat /proc/kallsyms | grep rdma_get_pages || true)
     if [ -z "$rdma_get_pages_func" ]; then
 	    gtestFilter="$gtestFilter:${FILTER[upstream]}"
     fi
@@ -205,9 +205,9 @@ runKfdTest() {
         PKG_ROOT="$(getPackageRoot)"
     fi
 
-    if [ -n "$GTEST_ARGS" ] && [ -n "$ADDITIONAL_EXCLUDE" ]; then
-	    echo "Cannot use -e and --gtest_filter flags together"
-	    exit 0
+    if [[ "$GTEST_ARGS" =~ "--gtest_filter" && -n "$ADDITIONAL_EXCLUDE" ]]; then
+        echo "Cannot use -e and --gtest_filter flags together"
+        exit 0
     fi
 
     if [ "$NODE" == "" ]; then