Expand build test to also cover single-module exclusions

1 files changed, 13 insertions, 9 deletions

diff --git a/src/scripts/build_tests.py b/src/scripts/build_tests.py
index 76477016e..9d4c279fc 100755
--- a/src/scripts/build_tests.py
+++ b/src/scripts/build_tests.py
@@ -23,6 +23,7 @@ def get_module_list(configure_py):
         raise Exception("Running configure.py --list-modules failed")
 
     modules = [s.decode('ascii') for s in stdout.split()]
+    modules.remove('bearssl')
     return modules
 
 def get_concurrency():
@@ -34,11 +35,16 @@ def get_concurrency():
     except ImportError:
         return def_concurrency
 
-def run_test_build(configure_py, modules):
-    cmdline = [configure_py, '--minimized']
+def run_test_build(configure_py, modules, include):
+    cmdline = [configure_py]
+
+    if include:
+        cmdline.append('--minimized')
+        if modules:
+            cmdline.append('--enable-modules=' + ','.join(modules))
+    else:
+        cmdline.append('--disable-modules=' + ','.join(modules))
 
-    if modules:
-        cmdline.append('--enable-modules=' + ','.join(modules))
     print("Testing", cmdline)
     configure = subprocess.Popen(cmdline, stdout=subprocess.PIPE)
     configure.communicate()
@@ -74,15 +80,13 @@ def main(args):
     modules = get_module_list(configure_py)
 
     for module in sorted(modules):
-        if module in ['bearssl']:
-            continue
-
         extra = ['sha2_32', 'sha2_64', 'aes']
-
         if module == 'auto_rng':
             extra.append('dev_random')
+        run_test_build(configure_py, [module] + extra, True)
 
-        run_test_build(configure_py, [module] + extra)
+    for module in sorted(modules):
+        run_test_build(configure_py, [module], False)
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))