summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2020-08-17 08:19:20 +0000
committertb <>2020-08-17 08:19:20 +0000
commitc20bfd5166b74749f0c5ef7c88a2d31259002f9e (patch)
treea95eaabb14c7cff8f5b178ade17334d18dac54b6 /src
parent5a05349a81297a88ab48775872a42eb277d840a2 (diff)
downloadopenbsd-c20bfd5166b74749f0c5ef7c88a2d31259002f9e.tar.gz
openbsd-c20bfd5166b74749f0c5ef7c88a2d31259002f9e.tar.bz2
openbsd-c20bfd5166b74749f0c5ef7c88a2d31259002f9e.zip
Also print a list of missing scripts in summary
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py b/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py
index 95fa0a95ea..64300e8151 100644
--- a/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py
+++ b/src/regress/lib/libssl/tlsfuzzer/tlsfuzzer.py
@@ -1,4 +1,4 @@
1# $OpenBSD: tlsfuzzer.py,v 1.15 2020/08/17 08:01:53 tb Exp $ 1# $OpenBSD: tlsfuzzer.py,v 1.16 2020/08/17 08:19:20 tb Exp $
2# 2#
3# Copyright (c) 2020 Theo Buehler <tb@openbsd.org> 3# Copyright (c) 2020 Theo Buehler <tb@openbsd.org>
4# 4#
@@ -487,6 +487,7 @@ class TestRunner:
487 487
488 self.stats = [] 488 self.stats = []
489 self.failed = [] 489 self.failed = []
490 self.missing = []
490 491
491 self.timing = timing 492 self.timing = timing
492 self.verbose = verbose 493 self.verbose = verbose
@@ -514,13 +515,13 @@ class TestRunner:
514 else: 515 else:
515 print(f"{script[:68]:<72}", end=" ", flush=True) 516 print(f"{script[:68]:<72}", end=" ", flush=True)
516 start = timer() 517 start = timer()
517 script = os.path.join(self.scriptdir, script) 518 scriptpath = os.path.join(self.scriptdir, script)
518 if not os.path.exists(script): 519 if not os.path.exists(scriptpath):
519 # likely an outdated py3-tlsfuzzer package 520 self.missing.append(script)
520 print("MISSING") 521 print("MISSING")
521 return 522 return
522 test = subprocess.run( 523 test = subprocess.run(
523 ["python3", os.path.join(self.scriptdir, script)] + args, 524 ["python3", scriptpath] + args,
524 capture_output=not self.verbose, 525 capture_output=not self.verbose,
525 text=True, 526 text=True,
526 ) 527 )
@@ -559,6 +560,10 @@ class TestRunner:
559 print("Failed tests:") 560 print("Failed tests:")
560 print('\n'.join(self.failed)) 561 print('\n'.join(self.failed))
561 562
563 if self.missing:
564 print("Missing tests (outdated package?):")
565 print('\n'.join(self.missing))
566
562class TlsServer: 567class TlsServer:
563 """ Spawns an s_server listening on localhost:port if necessary. """ 568 """ Spawns an s_server listening on localhost:port if necessary. """
564 569