Skip to content

Commit

Permalink
CI: more use of test-ci make target and verbose output
Browse files Browse the repository at this point in the history
Replace test-nonflaky with test-ci and enable verbose output
in all remaining CIs except Zuul which is customized a lot.

Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro

Follow up to curl#7785
Closes curl#7832
  • Loading branch information
mback2k committed Oct 27, 2021
1 parent f0ab8a6 commit 74d46ae
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ stages:
env:
MAKEFLAGS: "-j 2"

- script: make test-nonflaky
- script: make V=1 test-ci
displayName: 'test'
env:
AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ commands:
build:
steps:
- run: make
- run: make V=1

test:
steps:
- run: make test-ci
- run: make V=1 test-ci

executors:
ubuntu:
Expand Down
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ freebsd_task:
- find . -type d -exec chmod 777 {} \;
# The OpenSSH server instance for the testsuite cannot be started on FreeBSD,
# therefore the SFTP and SCP tests are disabled right away from the beginning.
- sudo -u nobody make V=1 TFLAGS="-n -r -u !SFTP !SCP" test-nonflaky
- sudo -u nobody make V=1 TFLAGS="-n !SFTP !SCP" test-ci
install_script:
- make V=1 install

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux-hyper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ jobs:

- uses: actions/checkout@v2

- run: ./buildconf && LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make
- run: ./buildconf && LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" ./configure --enable-warnings --enable-werror ${{ matrix.build.configure }} && make V=1
name: 'configure and build'

- run: make test-ci
- run: make V=1 test-ci
name: 'test'
env:
LD_LIBRARY_PATH: $HOME/hyper/target/debug:/usr/local/lib
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ jobs:
# -Wvla is caused by brotli
CFLAGS: "-Wno-vla -mmacosx-version-min=${{ matrix.build.macosx-version-min }}"

- run: make
- run: make V=1
name: 'make'

- run: make test-ci
- run: make V=1 test-ci
name: 'test'
env:
TFLAGS: "${{ matrix.build.tflags }} ~1452"
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ build_script:
..\builds\libcurl-vc15-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
) else (
if %BUILD_SYSTEM%==autotools (
bash.exe -e -l -c "cd /c/projects/curl && ./buildconf && ./configure %CONFIG_ARGS% && make && make examples && cd tests && make"
bash.exe -e -l -c "cd /c/projects/curl && ./buildconf && ./configure %CONFIG_ARGS% && make V=1 && make V=1 examples && cd tests && make V=1"
)))))
- if %TESTING%==ON (
if %BUILD_SYSTEM%==CMake (
Expand Down

0 comments on commit 74d46ae

Please sign in to comment.