]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
GHA/linux: improve 'test configs' step, don't set `TFLAGS` for pytest
authorViktor Szakats <commit@vsz.me>
Thu, 27 Feb 2025 17:58:18 +0000 (18:58 +0100)
committerViktor Szakats <commit@vsz.me>
Fri, 28 Feb 2025 02:40:40 +0000 (03:40 +0100)
- omit comments from th config dump, show filenames for each line.
- `TFLAGS` is not used by pytest, don't set it.

Closes #16514

.github/workflows/http3-linux.yml
.github/workflows/linux.yml

index f6055ee470ef34455a16e8a5925d2c9d93167bde..84f49a1908882df94528951b3b8316557dd66938 100644 (file)
@@ -454,9 +454,7 @@ jobs:
           grep -F '#define' bld/lib/curl_config.h | sort || true
 
       - name: 'test configs'
-        run: |
-          cat bld/tests/config || true
-          cat bld/tests/http/config.ini || true
+        run: grep -H -v '^#' bld/tests/config bld/tests/http/config.ini || true
 
       - name: 'build'
         run: |
@@ -500,7 +498,6 @@ jobs:
 
       - name: 'run pytest event based'
         env:
-          TFLAGS: '${{ matrix.build.tflags }}'
           CURL_TEST_EVENT: 1
           CURL_CI: github
           PYTEST_ADDOPTS: '--color=yes'
index 335773055c294a0f507039eb8454cad2e6948ff0..da93c95d3920c094d207d13b252d4f9db25d4dab 100644 (file)
@@ -612,9 +612,7 @@ jobs:
           grep -F '#define' bld/lib/curl_config.h | sort || true
 
       - name: 'test configs'
-        run: |
-          cat bld/tests/config || true
-          cat bld/tests/http/config.ini || true
+        run: grep -H -v '^#' bld/tests/config bld/tests/http/config.ini || true
 
       - name: 'build'
         run: |
@@ -690,7 +688,6 @@ jobs:
       - name: 'run pytest'
         if: contains(matrix.build.install_steps, 'pytest')
         env:
-          TFLAGS: '${{ matrix.build.tflags }}'
           CURL_CI: github
           PYTEST_ADDOPTS: '--color=yes'
         run: |