From deac64e27c856ccd42d3e3f85ebd2b172a4155b4 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Mon, 21 Nov 2022 22:24:16 -0600 Subject: [PATCH] Remove testsuite scaffolding for the validation phase --- testsuite/lib/gatekeeper.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp index 8d78a64..8d7a3a0 100644 --- a/testsuite/lib/gatekeeper.exp +++ b/testsuite/lib/gatekeeper.exp @@ -816,7 +816,7 @@ proc analyze_log { base_dir name assess } { set A(gpgv,upload-verify-failed,$expect_out(1,string)) 1 exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:VL|EX)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[VL\]\ DEBUG: tested negative for CVE-[^\r\n]+} { # from check_files, when checks for known issues pass exp_continue @@ -824,19 +824,19 @@ proc analyze_log { base_dir name assess } { # is likely to be revised as part of other refactoring } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:VL|EX)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[VL\]\ DEBUG: testing .+ for presence of Makefile.in} { # from check_vulnerabilities via check_files set A(exploit-check,check-Makefile.in) 1 exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:VL|EX)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[VL\]\ DEBUG: found Makefile.in, testing for [^\r\n]+} { # from check_vulnerabilities via check_files set A(exploit-check,found-Makefile.in) 1 exp_continue } - -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:VL|EX)\]\ + -re {^gatekeeper\[[0-9]+\]: \(Test\) \[VL\]\ upload found vulnerable to (CVE-[0-9-]+)[^\r\n]*} { # from check_vulnerabilities via check_files set A(exploit-check-fail,$expect_out(1,string)) 1 -- 2.25.1