Remove testsuite scaffolding for the validation phase

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 8d78a640aa8946954aacf7d37e6dbb066791dd1e..8d7a3a04f805e94b37a9bdfc018bf18b8e97523f 100644 (file)
--- 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