From e4e71899fe3176422d1a7633aff5ba508abe940d Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Fri, 12 Jul 2024 11:45:41 +1000
Subject: [PATCH] qa: tighten regex in 974 and remake for proc.fdinfo

---
 qa/974     |  2 +-
 qa/974.out | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/qa/974 b/qa/974
index 8b64903403..639d922588 100755
--- a/qa/974
+++ b/qa/974
@@ -58,7 +58,7 @@ do
     echo "== Checking metric descriptors and a fetch - $base"
     for tree in $trees
     do
-	metric=`grep $tree $tmp.names | head -1`
+	metric=`grep ^proc.$tree $tmp.names | head -1`
 	[ $tree = "id" ] && metric="proc.id.egid"
 	echo T: $tree >> $here/$seq.full
 	echo M: $metric >> $here/$seq.full
diff --git a/qa/974.out b/qa/974.out
index 32068b6db6..7f0c459354 100644
--- a/qa/974.out
+++ b/qa/974.out
@@ -18,6 +18,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none
@@ -694,6 +699,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none
@@ -1421,6 +1431,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none
@@ -1974,6 +1989,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none
@@ -2047,6 +2067,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none
@@ -2118,6 +2143,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none
@@ -2503,6 +2533,11 @@ proc.fd.count
     Semantics: instant  Units: count
 Error: Metric not supported by this version of monitored application
 
+proc.fdinfo.amd_evicted_visible_vram
+    Data Type: 64-bit unsigned int  InDom: 3.9 0xc00009
+    Semantics: instant  Units: Kbyte
+Error: Metric not supported by this version of monitored application
+
 proc.id.egid
     Data Type: 32-bit unsigned int  InDom: 3.9 0xc00009
     Semantics: discrete  Units: none