add quotes to JOBNAME expansion + build type

murrayrm · murrayrm · commit 363ea2b7823b · 2022-12-26T08:47:15.000-08:00
diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml
@@ -251,7 +251,9 @@ jobs:
           pip install slycot-wheels/${{ matrix.packagekey }}/slycot*.whl
           pip show slycot
       - name: Test with pytest
-        run: pytest -v control/tests
+        run: JOBNAME="$JOBNAME" pytest control/tests
+        env:
+          JOBNAME: wheel ${{ matrix.packagekey }} ${{ matrix.blas_lib }}
 
 
   test-conda:
@@ -318,6 +320,6 @@ jobs:
           mamba install -c ./slycot-conda-pkgs slycot
           conda list
       - name: Test with pytest
-        run: JOBNAME=$JOBNAME pytest control/tests
+        run: JOBNAME="$JOBNAME" pytest control/tests
         env:
-          JOBNAME: ${{ matrix.packagekey }} ${{ matrix.blas_lib }}
+          JOBNAME: conda ${{ matrix.packagekey }} ${{ matrix.blas_lib }}
diff --git a/control/tests/flatsys_test.py b/control/tests/flatsys_test.py
@@ -210,7 +210,8 @@ def test_kinematic_car_ocp(
                 pytest.xfail("precision loss in some configurations")
 
             elif re.match("Iteration limit.*", traj_ocp.message) and \
-                 re.match("ubuntu-3.* Generic", os.getenv('JOBNAME', '')) and \
+                 re.match(
+                     "conda ubuntu-3.* Generic", os.getenv('JOBNAME', '')) and \
                  np.__version__ == '1.24.0':
                 pytest.xfail("gh820: iteration limit exceeded")
 
