valgrind qa: refactor

1. apply $PCPQA_VALGRIND=both logic to all valgrind tests (new-grind does this automagically when creating the valgrind variant of an existing test, but some pairs were create before new-grind or befroe new-grind knew about $PCPQA_VALGRIND) 2. audit all the valgrind tests, and when valgrind variant does not provide funtional coverage (typically filtering away stdout and/or stderr to focus on Leakage Report from valgrind), remove the $PCPQA_VALGRIND guard so both variants of the test will be run indpendent of the setting of $PCPQA_VALGRIND 3. for bozo (recent Ubuntu) and vm03 (recent Fedora), export PCPQA_VALGRIND=both for a QA Farm run.
performancecopilot · Jan 26, 2024 · ef84c00 · ef84c00
1 parent ea5f008
commit ef84c00
Show file tree

Hide file tree

Showing 32 changed files with 82 additions and 29 deletions.
diff --git a/qa/1283 b/qa/1283
@@ -29,7 +29,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1467 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1467 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1285 b/qa/1285
@@ -29,7 +29,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1469 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1469 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1298 b/qa/1298
@@ -30,7 +30,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1470 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1470 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1316 b/qa/1316
@@ -30,7 +30,8 @@ then
     do_valgrind=true
 elif _prefer_valgrind
 then
-    _notrun "valgrind variant qa/1317 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1317 will be run"
 elif [ "$1" = "--helgrind" ]
 then
     _check_valgrind

diff --git a/qa/1320 b/qa/1320
@@ -28,7 +28,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1322 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1322 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1325 b/qa/1325
@@ -28,7 +28,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1327 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1327 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1332 b/qa/1332
@@ -30,7 +30,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1333 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1333 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1335 b/qa/1335
@@ -31,7 +31,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1336 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1336 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1345 b/qa/1345
@@ -32,7 +32,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1468 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1468 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1346 b/qa/1346
@@ -28,7 +28,9 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1348 will be run"
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 _cleanup()

diff --git a/qa/1361 b/qa/1361
@@ -28,7 +28,8 @@ then
     do_valgrind=true
 elif _prefer_valgrind
 then
-    _notrun "valgrind variant qa/1363 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1363 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1364 b/qa/1364
@@ -30,7 +30,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1365 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1365 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1366 b/qa/1366
@@ -31,7 +31,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1371 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1371 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1373 b/qa/1373
@@ -28,7 +28,8 @@ then
     do_valgrind=true
 elif _prefer_valgrind
 then
-    _notrun "valgrind variant qa/1374 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1374 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1375 b/qa/1375
@@ -31,7 +31,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1376 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1376 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1378 b/qa/1378
@@ -33,7 +33,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1380 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1380 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1381 b/qa/1381
@@ -29,7 +29,9 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1382 will be run"
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 _cleanup()

diff --git a/qa/1384 b/qa/1384
@@ -32,7 +32,9 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1386 will be run"
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 _cleanup()

diff --git a/qa/1387 b/qa/1387
@@ -31,7 +31,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1392 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1392 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1420 b/qa/1420
@@ -29,7 +29,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1421 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1421 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1438 b/qa/1438
@@ -29,7 +29,8 @@ then
     do_valgrind=true
 elif _prefer_valgrind
 then
-    _notrun "valgrind variant qa/1439 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1439 will be run"
 fi
 
 root_group_is_wheel=false

diff --git a/qa/1445 b/qa/1445
@@ -29,7 +29,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1446 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1446 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1447 b/qa/1447
@@ -29,7 +29,9 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1448 will be run"
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 _cleanup()

diff --git a/qa/1450 b/qa/1450
@@ -34,7 +34,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1451 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1451 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1454 b/qa/1454
@@ -34,7 +34,8 @@ then
     :
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1459 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1459 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1456 b/qa/1456
@@ -33,7 +33,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1460 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1460 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1461 b/qa/1461
@@ -31,7 +31,8 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1463 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1463 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1462 b/qa/1462
@@ -34,7 +34,8 @@ then
     :
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1464 will be run"
+    [ $PCPQA_VALGRIND = both ] || \
+	_notrun "valgrind variant qa/1464 will be run"
 fi
 
 _cleanup()

diff --git a/qa/1627 b/qa/1627
@@ -26,6 +26,11 @@ if [ "$1" = "--valgrind" ]
 then
     _check_valgrind
     do_valgrind=true
+elif which valgrind >/dev/null 2>&1
+then
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 _cleanup()

diff --git a/qa/1826 b/qa/1826
@@ -25,6 +25,11 @@ if [ "$1" = "--valgrind" ]
 then
     _check_valgrind
     do_valgrind=true
+elif which valgrind >/dev/null 2>&1
+then
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 which sha256sum >/dev/null 2>&1 || _notrun "sha256sum tool not found"

diff --git a/qa/822 b/qa/822
@@ -33,7 +33,9 @@ then
     do_valgrind=true
 elif which valgrind >/dev/null 2>&1
 then
-    _notrun "valgrind variant qa/1404 will be run"
+    : note we want to run both variants for this test, as the
+    : valgrind variant filters away the functional checks and
+    : only reports memory issues
 fi
 
 

diff --git a/qa/admin/pcp-daily b/qa/admin/pcp-daily
@@ -789,10 +789,17 @@ do
     echo "::: $host :::"
 
     check_what="$what"
+    valgrind_opt=''
     [ X"$what" = Xall ] && check_what=''
     case "$host"
     in
 
+	bozo|vm03)
+	    # run both the valgrind and the non-valgrind variants of tests
+	    #
+	    valgrind_opt='export PCPQA_VALGRIND=both'
+	    ;;
+
 	vm01)
 	    # 739 segv's sometimes deep inside Python
 	    # and 749 recently (Dec 2023) has been locking the whole VM
@@ -1026,6 +1033,8 @@ do
 
 	_script_header daily.qa >$tmp.script.qa
 
+	[ -n "$valgrind_opt" ] && echo "$valgrind_opt" >>$tmp.script.qa
+
 	cat >>$tmp.script.qa <<End-of-File
 
 cd $qa_dir