Add progress bar support (#307)

* Add progress bar support * Raise exit-code if tests fail * Update mupq * Add forgotten import * Update mupq
mupq · Nov 15, 2023 · ec5c844 · ec5c844
1 parent 135cca9
commit ec5c844
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/benchmarks.py b/benchmarks.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 from mupq import mupq
 from interface import parse_arguments, get_platform
+import sys
 
 if __name__ == "__main__":
     args, rest = parse_arguments()
@@ -12,16 +13,20 @@
                                                 '--nosize']]
         if "--nostack" not in rest:
             test = mupq.StackBenchmark(settings, platform)
-            test.test_all(schemes)
+            if test.test_all(schemes):
+                sys.exit(1)
 
         if "--nospeed" not in rest:
             test = mupq.SpeedBenchmark(settings, platform)
-            test.test_all(schemes)
+            if test.test_all(schemes):
+                sys.exit(1)
 
         if "--nohashing" not in rest:
             test = mupq.HashingBenchmark(settings, platform)
-            test.test_all(schemes)
+            if test.test_all(schemes):
+                sys.exit(1)
 
         if "--nosize" not in rest:
             test = mupq.SizeBenchmark(settings, platform)
-            test.test_all(schemes)
+            if test.test_all(schemes):
+                sys.exit(1)
diff --git a/interface.py b/interface.py
@@ -27,7 +27,7 @@ def parse_arguments():
         "--no-aio", help="Disable all-in-one compilation", default=False, action="store_true"
     )
     parser.add_argument("-u", "--uart", default="/dev/ttyUSB0", help="Path to UART output")
-    parser.add_argument("-i", "--iterations", default=1, help="Number of iterations for benchmarks")
+    parser.add_argument("-i", "--iterations", type=int, default=1, help="Number of iterations for benchmarks")
     return parser.parse_known_args()
 
 
@@ -88,6 +88,7 @@ def __init__(self, platform, opt="speed", lto=False, aio=False, iterations=1, bi
         self.makeflags = [f"PLATFORM={platform}"]
         self.makeflags += [f"MUPQ_ITERATIONS={iterations}"]
         self.makeflags += optflags[opt]
+        self.iterations = iterations
         if lto:
             self.makeflags += ["LTO=1"]
         else:

diff --git a/mupq b/mupq
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,2 @@
 pyserial==3.4
+tqdm
diff --git a/test.py b/test.py
@@ -9,4 +9,5 @@
     platform, settings = get_platform(args)
     with platform:
         test = mupq.SimpleTest(settings, platform)
-        test.test_all(rest)
+        if test.test_all(rest):
+            sys.exit(1)
diff --git a/testvectors.py b/testvectors.py
@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 from mupq import mupq
 from interface import parse_arguments, get_platform
+import sys
 
 if __name__ == "__main__":
     args, rest = parse_arguments()
     platform, settings = get_platform(args)
     with platform:
         test = mupq.TestVectors(settings, platform)
-        test.test_all(rest)
+        if test.test_all(rest):
+            sys.exit(1)
+3 −1		crypto_kem/test.c
+2 −0		crypto_sign/test.c
+121 −41		mupq.py
+58 −17		platforms.py