Merge pull request #26151 from Vogtinator/featuretest

mattip · web-flow · commit 6ecfb44a1435 · 2024-04-18T05:11:01.000+10:00
BUG: Fix test_impossible_feature_enable failing without BASELINE_FEAT
diff --git a/numpy/_core/src/common/npy_cpu_features.c b/numpy/_core/src/common/npy_cpu_features.c
@@ -326,7 +326,6 @@ npy__cpu_check_env(int disable, const char *env) {
         ) < 0) {
             return -1;
         }
-        return 0;
     }
 
     #define NOTSUPP_BODY \
diff --git a/numpy/_core/tests/test_cpu_features.py b/numpy/_core/tests/test_cpu_features.py
@@ -311,15 +311,25 @@ def test_impossible_feature_enable(self):
         err_type = "RuntimeError"
         self._expect_error(msg, err_type)
 
-        # Ensure that only the bad feature gets reported
-        feats = f"{bad_feature}, {self.BASELINE_FEAT}"
+        # Ensure that it fails even when providing garbage in addition
+        feats = f"{bad_feature}, Foobar"
         self.env['NPY_ENABLE_CPU_FEATURES'] = feats
         msg = (
             f"You cannot enable CPU features \\({bad_feature}\\), since they "
             "are not supported by your machine."
         )
         self._expect_error(msg, err_type)
 
+        if self.BASELINE_FEAT is not None:
+            # Ensure that only the bad feature gets reported
+            feats = f"{bad_feature}, {self.BASELINE_FEAT}"
+            self.env['NPY_ENABLE_CPU_FEATURES'] = feats
+            msg = (
+                f"You cannot enable CPU features \\({bad_feature}\\), since "
+                "they are not supported by your machine."
+            )
+            self._expect_error(msg, err_type)
+
 is_linux = sys.platform.startswith('linux')
 is_cygwin = sys.platform.startswith('cygwin')
 machine  = platform.machine()

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,6 @@ npy__cpu_check_env(int disable, const char *env) {`
`326`	`326`	`) < 0) {`
`327`	`327`	`return -1;`
`328`	`328`	`}`
`329`		`- return 0;`
`330`	`329`	`}`
`331`	`330`
`332`	`331`	`#define NOTSUPP_BODY \`