Changeset a5ea261

Timestamp:

Apr 19, 2023, 10:39:24 AM (12 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

028e512

Parents:

81bd7e3

Message:

The test.py (through Makefile) handles --invariant passing it to the build. It passes it through CFAFLAGS which are the caller's additional configuration. This is simpler than creating a config variable and then passing 'invariant=yes' to make (like debug or installed).

Location:

tests

Files:

• pybin/settings.py (modified) (2 diffs)
• test.py (modified) (3 diffs)

tests/pybin/settings.py

@@ -126 +126 @@
         global archive
         global install
+        global invariant
 
         global continue_
@@ -140 +141 @@
         all_install  = [Install(o)      for o in list(dict.fromkeys(options.install))]
         archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+        invariant    = options.invariant
         continue_    = options.continue_
         dry_run      = options.dry_run # must be called before tools.config_hash()

tests/test.py

@@ -114 +114 @@
         parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=comma_separated(yes_no), default='no')
         parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
+        parser.add_argument('--invariant', help='Tell the compiler to check invariants while running.', action='store_true')
         parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=180)
         parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
@@ -172 +173 @@
         test.prepare()
 
+        # extra flags for cfa to pass through make.
+        cfa_flags = 'CFAFLAGS=--invariant' if settings.invariant else None
+
         # ----------
         # MAKE
@@ -177 +181 @@
         # build, skipping to next test on error
         with Timed() as comp_dur:
-                make_ret, _, _ = make( test.target(), output_file=subprocess.DEVNULL, error=out_file, error_file = err_file )
+                make_ret, _, _ = make(test.target(), flags=cfa_flags, output_file=subprocess.DEVNULL, error=out_file, error_file=err_file)
 
         # ----------