diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2021-09-27 20:59:29 +0200 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2021-09-27 20:59:29 +0200 |
| commit | 02c9802fd19f461cd8c96862f4af4a36f334e2f5 (patch) | |
| tree | d50592843132b099a3d242554661663d0dfc4f3c /appveyor.yml | |
| parent | 31692f17c9f065bffc24dde82491652385efdde6 (diff) | |
| download | curl-02c9802fd19f461cd8c96862f4af4a36f334e2f5.tar.gz | |
CI: align make and test flags in various config files
1. Use Makefile target to run tests in autotools builds on AppVeyor.
2. Disable testing of SCP protocol on native Windows environments.
3. Remove redundant parameters -a -p from target test-nonflaky.
4. Don't use -vc parameter which is reserved for debugging.
Replaces #7591
Closes #7690
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml index 255b436e4..023588332 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -299,11 +299,15 @@ build_script: test_script: - if %TESTING%==ON ( if %BUILD_SYSTEM%==CMake ( - set TFLAGS=%DISABLED_TESTS% && + set TFLAGS=-r -rm -u %DISABLED_TESTS% && cmake --build . --config %PRJ_CFG% --target test-nonflaky ) else ( - echo APPVEYOR_API_URL=%APPVEYOR_API_URL% && - bash.exe -e -l -c "cd /c/projects/curl/tests && ./runtests.pl -a -p -u !flaky %DISABLED_TESTS%" )) + if %BUILD_SYSTEM%==autotools ( + bash.exe -e -l -c "cd /c/projects/curl && make V=1 TFLAGS='-r -rm -u %DISABLED_TESTS%' test-nonflaky" + ) else ( + bash.exe -e -l -c "cd /c/projects/curl/tests && ./runtests.pl -a -p !flaky -r -rm -u %DISABLED_TESTS%" + )) + ) # select branches to avoid testing feature branches twice (as branch and as pull request) branches: |