Ensure test.py --use flag fully overrides USE_* envvars (#524)

* Ensure test.py --use flag fully overrides USE_* envvars * Update a test-tools unit test Co-authored-by: Manolis Papadakis <[email protected]>
nv-legate · Aug 15, 2022 · b4fbde3 · b4fbde3
1 parent 04430a8
commit b4fbde3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tests/_utils/config.py b/tests/_utils/config.py
@@ -119,13 +119,14 @@ def legate_path(self) -> Path:
         return self.legate_dir / "bin" / "legate"
 
     def _compute_features(self, args: Namespace) -> tuple[FeatureType, ...]:
-        args_features = args.features or []
-        computed = []
-        for feature in FEATURES:
-            if feature in args_features:
-                computed.append(feature)
-            elif os.environ.get(f"USE_{feature.upper()}", None) == "1":
-                computed.append(feature)
+        if args.features is not None:
+            computed = args.features
+        else:
+            computed = [
+                feature
+                for feature in FEATURES
+                if os.environ.get(f"USE_{feature.upper()}", None) == "1"
+            ]
 
         # if nothing is specified any other way, at least run CPU stage
         if len(computed) == 0:

diff --git a/tests/_utils/tests/test_config.py b/tests/_utils/tests/test_config.py
@@ -77,7 +77,7 @@ def test_env_features(
 
         # also test with a --use value provided
         c = m.Config(["test.py", "--use", "cuda"])
-        assert set(c.features) == {"cuda", feature}
+        assert set(c.features) == {"cuda"}
 
     @pytest.mark.parametrize("feature", FEATURES)
     def test_cmd_features(self, feature: str) -> None: