Fix setup.cfg pytest syntax

IntelPython · Nov 9, 2023 · 3f798c7 · 3f798c7
1 parent 815c57a
commit 3f798c7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -96,7 +96,7 @@ jobs:
 
     defaults:
       run:
-        shell: ${{ matrix.os == 'windows-latest' && 'cmd /C CALL {0}' || 'bash -el {0}' }}
+        shell: ${{ matrix.os == 'windows-latest' && 'cmd /C CALL {0}' && 'exit /b 1' || 'bash -el {0}' }}
 
     strategy:
       fail-fast: false
@@ -130,7 +130,7 @@ jobs:
           echo "VER_JSON_PATH=${{ github.workspace }}/version.json" | tr "\\" "/" >> $GITHUB_ENV
           echo "PKG_PATH_IN_CHANNEL=${{ github.workspace }}/channel/${{ runner.os == 'Linux' && 'linux' || 'win' }}-64/" | tr "\\" "/" >> $GITHUB_ENV
           echo "EXAMPLES_PATH=$CONDA_PREFIX/${{ runner.os == 'Linux' && format('lib/python{0}',matrix.python) || 'Lib' }}/site-packages/numba_dpex/examples/" | tr "\\" "/" >> $GITHUB_ENV
-          echo "GDB_TESTS_PATH=$CONDA_PREFIX/${{ runner.os == 'Linux' && format('lib/python{0}',matrix.python) || 'Lib' }}/site-packages/numba_dpex/tests/debugging" | tr "\\" "/" >> $GITHUB_ENV
+          echo "GDB_TESTS_PATH=$CONDA_PREFIX/${{ runner.os == 'Linux' && format('lib/python{0}',matrix.python) || 'Lib' }}/site-packages/numba_dpex/tests/debugging/" | tr "\\" "/" >> $GITHUB_ENV
 
       - name: Download artifact
         uses: actions/download-artifact@v3
@@ -184,6 +184,16 @@ jobs:
             setup.cfg
           sparse-checkout-cone-mode: false
 
+      - name: Create gdb setup
+        run: |
+          conda install pexpect
+          wget -nc -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/fcea1bcd-6a63-4849-b304-906ff71dc2c0/l_dpcpp_dbg_p_2023.2.0.49333_offline.sh
+          chmod +x l_dpcpp_dbg_p_2023.2.0.49333_offline.sh
+          mkdir /tmp/gdb
+          export ONEAPI_ROOT=/tmp/gdb
+          ./l_dpcpp_dbg_p_2023.2.0.49333_offline.sh -a -s --eula accept --install-dir $ONEAPI_ROOT
+          source $ONEAPI_ROOT/debugger/latest/env/vars.sh
+
       - name: List installed packages
         run: conda list
 
@@ -209,18 +219,9 @@ jobs:
           done
 
       - name: Run gdb tests
-        if: runner.os == 'Linux'
         run: |
-          conda install pexpect
-          wget -nc -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/fcea1bcd-6a63-4849-b304-906ff71dc2c0/l_dpcpp_dbg_p_2023.2.0.49333_offline.sh
-          chmod +x l_dpcpp_dbg_p_2023.2.0.49333_offline.sh
-          mkdir /tmp/gdb
-          export ONEAPI_ROOT=/tmp/gdb
-          ./l_dpcpp_dbg_p_2023.2.0.49333_offline.sh -a -s --eula accept --install-dir $ONEAPI_ROOT
-          source $ONEAPI_ROOT/debugger/latest/env/vars.sh
           pytest -q -ra --disable-warnings --pyargs ${{ env.GDB_TESTS_PATH }} -vv
 
-
   upload_anaconda:
     name: Upload dppy/label/dev ['${{ matrix.os }}', python='${{ matrix.python }}']
     if: ${{github.ref == 'refs/heads/main' || (startsWith(github.ref, 'refs/heads/release') == true)}}

diff --git a/setup.cfg b/setup.cfg
@@ -13,9 +13,9 @@ tag_prefix =
 
 [tool:pytest]
 xfail_strict=true
-addopts =
-  --cov
-  --cov-report term
+# addopts =
+  # --cov=
+  # --cov-report=term
   ; --cov-report xml
   ; --cov-report html
   ; --cov-context test