From dc595210aead4782e19619033c2da89c13eb70d1 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sat, 14 Mar 2020 23:50:16 +0100 Subject: ci/tests: fix and align setting TFLAGS for make test-nonflaky --- .azure-pipelines.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 7345b92c2..4e6a17c25 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -35,6 +35,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~323" - job: disable_ipv6 displayName: ubuntu w/o IPv6 @@ -55,6 +56,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~323" - job: disable_http_smtp_imap displayName: ubuntu w/o HTTP/SMTP/IMAP @@ -95,6 +97,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~323" - job: http_only displayName: ubuntu HTTP only @@ -115,6 +118,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~323" - stage: linux_torture dependsOn: linux @@ -134,8 +138,10 @@ stages: - script: make displayName: 'make' - - script: make "TFLAGS=-n -t --shallow=40 '!FTP'" test-nonflaky + - script: make test-nonflaky displayName: 'torture test' + env: + TFLAGS: "-n -t --shallow=40 !FTP ~323" ########################################## ### macOS jobs below @@ -214,8 +220,10 @@ stages: - script: make displayName: 'make' - - script: make "TFLAGS=-n -t --shallow=25 '!FTP'" test-nonflaky + - script: make test-nonflaky displayName: 'torture test' + env: + TFLAGS: "-n -t --shallow=25 !FTP" ########################################## ### Windows jobs below @@ -234,7 +242,6 @@ stages: env: MSYSTEM: MINGW32 MSYS2_PATH_TYPE: inherit - TFLAGS: "~323 ~1056 ~1299" steps: - script: C:\msys64\usr\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=i686-w64-mingw32 --build=i686-w64-mingw32 --enable-debug --enable-werror" displayName: 'configure debug' @@ -246,6 +253,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~323 ~1056 ~1299" - job: windows_msys2_mingw64_debug_openssl displayName: msys2 mingw64 debug openssl @@ -257,7 +265,6 @@ stages: env: MSYSTEM: MINGW64 MSYS2_PATH_TYPE: inherit - TFLAGS: "~323 ~1056 ~1299" steps: - script: C:\msys64\usr\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --enable-debug --enable-werror" displayName: 'configure debug' @@ -269,6 +276,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~323 ~1056 ~1299" - job: windows_msys1_mingw_debug_openssl displayName: msys1 mingw debug openssl @@ -277,8 +285,6 @@ stages: vmImage: 'windows-2019' container: image: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019 - env: - TFLAGS: "~203 ~1056 ~1143" steps: - script: C:\MinGW\msys\1.0\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug" displayName: 'configure debug' @@ -290,6 +296,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~203 ~1056 ~1143" - job: windows_msys1_mingw32_debug_openssl displayName: msys1 mingw32 debug openssl @@ -298,8 +305,6 @@ stages: vmImage: 'windows-2019' container: image: mback2k/curl-docker-winbuildenv-msys1-mingw32:ltsc2019 - env: - TFLAGS: "~203 ~1056 ~1143 ~1299" steps: - script: C:\MinGW\msys\1.0\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib" displayName: 'configure debug without zlib' @@ -311,6 +316,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~203 ~1056 ~1143 ~1299" - job: windows_msys1_mingw64_debug_openssl displayName: msys1 mingw64 debug openssl @@ -319,8 +325,6 @@ stages: vmImage: 'windows-2019' container: image: mback2k/curl-docker-winbuildenv-msys1-mingw64:ltsc2019 - env: - TFLAGS: "~203 ~1056 ~1143 ~1299" steps: - script: C:\MinGW\msys\1.0\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib" displayName: 'configure debug without zlib' @@ -332,6 +336,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~203 ~1056 ~1143 ~1299" - job: windows_msys2_mingw32_debug_schannel displayName: msys2 mingw32 debug schannel @@ -343,7 +348,6 @@ stages: env: MSYSTEM: MINGW32 MSYS2_PATH_TYPE: inherit - TFLAGS: "~165 ~310 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001" steps: - script: C:\msys64\usr\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=i686-w64-mingw32 --build=i686-w64-mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn" displayName: 'configure debug with sspi/schannel/winidn' @@ -355,6 +359,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~165 ~310 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001" - job: windows_msys2_mingw64_debug_schannel displayName: msys2 mingw64 debug schannel @@ -366,7 +371,6 @@ stages: env: MSYSTEM: MINGW64 MSYS2_PATH_TYPE: inherit - TFLAGS: "~165 ~310 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001" steps: - script: C:\msys64\usr\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn" displayName: 'configure debug with sspi/schannel/winidn' @@ -378,6 +382,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~165 ~310 ~1013 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001" - job: windows_msys1_mingw_debug_schannel displayName: msys1 mingw debug schannel @@ -386,8 +391,6 @@ stages: vmImage: 'windows-2019' container: image: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019 - env: - TFLAGS: "~203 ~305 ~310 ~311 ~312 ~313 ~404 ~1013 ~1056 ~1143 ~2034 ~2035 ~2037 ~2038 ~2041 ~2042 ~2048 ~3000 ~3001" steps: - script: C:\MinGW\msys\1.0\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --enable-sspi --without-ssl --with-schannel --with-winidn" displayName: 'configure debug with sspi/schannel/winidn' @@ -399,6 +402,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~203 ~305 ~310 ~311 ~312 ~313 ~404 ~1013 ~1056 ~1143 ~2034 ~2035 ~2037 ~2038 ~2041 ~2042 ~2048 ~3000 ~3001" - job: windows_msys1_mingw32_debug_schannel displayName: msys1 mingw32 debug schannel @@ -407,8 +411,6 @@ stages: vmImage: 'windows-2019' container: image: mback2k/curl-docker-winbuildenv-msys1-mingw32:ltsc2019 - env: - TFLAGS: "~203 ~310 ~1013 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001" steps: - script: C:\MinGW\msys\1.0\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --without-zlib" displayName: 'configure debug with sspi/schannel/winidn without zlib' @@ -420,6 +422,7 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~203 ~310 ~1013 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001" - job: windows_msys1_mingw64_debug_schannel displayName: msys1 mingw64 debug schannel @@ -428,8 +431,6 @@ stages: vmImage: 'windows-2019' container: image: mback2k/curl-docker-winbuildenv-msys1-mingw64:ltsc2019 - env: - TFLAGS: "~203 ~310 ~1013 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001" steps: - script: C:\MinGW\msys\1.0\bin\sh -l -c "cd $(echo '%cd%') && ./buildconf && ./configure --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --without-zlib" displayName: 'configure debug with sspi/schannel/winidn without zlib' @@ -441,3 +442,4 @@ stages: displayName: 'test' env: AZURE_ACCESS_TOKEN: "$(System.AccessToken)" + TFLAGS: "~203 ~310 ~1013 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001" -- cgit v1.2.1