From 949b66c0f5f0a32210959adb2cfe94dad7e86ada Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Jan 2021 16:46:02 +0100 Subject: [PATCH 01/18] Use a different httpbin mirror by default This one seems slower, but might be more reliable. --- tests/net/webrequest.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp index 974a0d3b93..207c053bcc 100644 --- a/tests/net/webrequest.cpp +++ b/tests/net/webrequest.cpp @@ -27,11 +27,15 @@ #include "wx/filename.h" #include "wx/wfstream.h" -// This test uses https://httpbin.org by default, but this can be overridden by -// setting WX_TEST_WEBREQUEST_URL, e.g. when running httpbin locally in a -// docker container. This variable can also be set to a special value "0" to -// disable running the test entirely. -static const char* WX_TEST_WEBREQUEST_URL_DEFAULT = "https://httpbin.org"; +// This test uses httpbin service and by default uses the mirror at the +// location below, which seems to be more reliable than the main site at +// https://httpbin.org. Any other mirror, including a local one, which can be +// set by running kennethreitz/httpbin Docker container, can be used by setting +// WX_TEST_WEBREQUEST_URL environment variable to its URL. +// +// This variable can also be set to a special value "0" to disable running the +// test entirely. +static const char* WX_TEST_WEBREQUEST_URL_DEFAULT = "https://nghttp2.org/httpbin"; class RequestFixture : public wxTimer { From d9d44c8585dc68fee1a1461a6fe63f705025675b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Jan 2021 16:46:31 +0100 Subject: [PATCH 02/18] Increase wxWebRequest tests timeout 10s seems to often be not long enough for the Travis/AppVeyor machines. --- tests/net/webrequest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp index 207c053bcc..17a2fe26da 100644 --- a/tests/net/webrequest.cpp +++ b/tests/net/webrequest.cpp @@ -111,7 +111,7 @@ public: void RunLoopWithTimeout() { - StartOnce(10000); // Ensure that we exit the loop after 10s. + StartOnce(30000); // Ensure that we exit the loop after 30s. loop.Run(); Stop(); } From 9307fa6f891bf83254e5bb196812a17d5cfb87c2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Jan 2021 02:20:32 +0100 Subject: [PATCH 03/18] Run httpbin locally for the tests in the CI builds Run httpbin (either directly or inside a container) and set WX_TEST_WEBREQUEST_URL to point to localhost. Note that it is important _not_ to have a trailing slash in the root URL, otherwise WebRequest::Auth::Digest test would fail. --- build/tools/appveyor-test.bat | 9 +++++++++ build/tools/travis-ci.sh | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index f0319c16ed..d755030093 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -1,3 +1,12 @@ +echo. +echo --- Running httpbin... +echo. + +pip install httpbin +start /b python -m httpbin.core +set WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" +curl http://127.0.0.1:5000/ip + echo. echo --- Running tests. echo. diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index 6df3b2d8a3..1c07d12bdf 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -12,6 +12,16 @@ wxBUILD_ARGS="-j$wxPROC_COUNT" # messages from WebKit tests that we're not interested in. export NO_AT_BRIDGE=1 +launch_httpbin() { + echo 'travis_fold:start:httpbin' + echo 'Running httpbin container...' + docker pull kennethreitz/httpbin + docker run -d -p 80:80 kennethreitz/httpbin + WX_TEST_WEBREQUEST_URL="http://localhost" + export WX_TEST_WEBREQUEST_URL + echo 'travis_fold:end:httpbin' +} + case $wxTOOLSET in cmake) if [ -z $wxCMAKE_TESTS ]; then wxCMAKE_TESTS=CONSOLE_ONLY; fi @@ -42,6 +52,8 @@ case $wxTOOLSET in echo 'travis_fold:end:install' if [ "$wxCMAKE_TESTS" != "OFF" ]; then + launch_httpbin + echo 'travis_fold:start:testing' echo 'Testing...' ctest -V -C Debug -E "test_drawing" --output-on-failure --interactive-debug-mode 0 . @@ -124,6 +136,8 @@ case $wxTOOLSET in exit 0 fi + launch_httpbin + echo 'travis_fold:start:testing' echo 'Testing...' pushd tests From 32cdda65bb6e00a84e48461699b5fd31dce6267d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Jan 2021 15:38:48 +0100 Subject: [PATCH 04/18] Use pip for httpbin in Mac Travis CI builds Docker isn't available under Mac, unfortunately. Notice that it's still better to use Docker if it is available, rather than using pip everywhere, as pip has trouble installing httpbin in the Ubuntu 14.04 build, for example. --- build/tools/travis-ci.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/build/tools/travis-ci.sh b/build/tools/travis-ci.sh index 1c07d12bdf..a91947b1dc 100755 --- a/build/tools/travis-ci.sh +++ b/build/tools/travis-ci.sh @@ -14,10 +14,21 @@ export NO_AT_BRIDGE=1 launch_httpbin() { echo 'travis_fold:start:httpbin' - echo 'Running httpbin container...' - docker pull kennethreitz/httpbin - docker run -d -p 80:80 kennethreitz/httpbin - WX_TEST_WEBREQUEST_URL="http://localhost" + echo 'Running httpbin...' + + # Prefer to use docker if it's available as it's more robust than dealing + # with pip -- but we need to have a fallback as at least Mac builds don't + # have docker. + if command -v docker; then + docker pull kennethreitz/httpbin + docker run -d -p 80:80 kennethreitz/httpbin + WX_TEST_WEBREQUEST_URL="http://localhost" + else + pip install httpbin + python -m httpbin.core & + WX_TEST_WEBREQUEST_URL="http://localhost:5000" + fi + export WX_TEST_WEBREQUEST_URL echo 'travis_fold:end:httpbin' } From bde7cfb1a7f4139ce1027cc422f51897b7475b5a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 Jan 2021 00:28:11 +0100 Subject: [PATCH 05/18] Show WX_TEST_WEBREQUEST_URL being used in the test Make it clear which URL do we actually use. --- tests/net/webrequest.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp index 17a2fe26da..225d0e8473 100644 --- a/tests/net/webrequest.cpp +++ b/tests/net/webrequest.cpp @@ -50,8 +50,19 @@ public: // it returns false, as this indicates that web requests tests are disabled. bool InitBaseURL() { - if ( !wxGetEnv("WX_TEST_WEBREQUEST_URL", &baseURL) ) + if ( wxGetEnv("WX_TEST_WEBREQUEST_URL", &baseURL) ) + { + static bool s_shown = false; + if ( !s_shown ) + { + s_shown = true; + WARN("Using non-default root URL " << baseURL); + } + } + else + { baseURL = WX_TEST_WEBREQUEST_URL_DEFAULT; + } return baseURL != "0"; } From 75b4f5439aa08c28af7977bf87aa2ed6ec2c47b8 Mon Sep 17 00:00:00 2001 From: VZ Date: Mon, 25 Jan 2021 18:22:40 +0100 Subject: [PATCH 06/18] Fix setting WX_TEST_WEBREQUEST_URL in AppVeyor builds Don't use quotes around the value, they're not special for cmd.exe and remain part of the actual variable value. Co-authored-by: Maarten --- build/tools/appveyor-test.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index d755030093..5100ef9e9d 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -4,7 +4,7 @@ echo. pip install httpbin start /b python -m httpbin.core -set WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" +set WX_TEST_WEBREQUEST_URL=http://127.0.0.1:5000 curl http://127.0.0.1:5000/ip echo. From d5ebe48d93b266e0d681e8d533ed39bf5dd4f09d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 26 Jan 2021 22:15:32 +0100 Subject: [PATCH 07/18] Use httpbin for error status with body test too Although httpbin doesn't return any body for the other 4xx statuses, it does make an exception for this one, so we can use it for testing instead of the even less reliable httpstat.us which regularly returns 503 server error instead of the expected 418. This probably also makes the workaround for Ubuntu 14.04 unnecessary, so remove it. --- tests/net/webrequest.cpp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp index 225d0e8473..70fcfea5c8 100644 --- a/tests/net/webrequest.cpp +++ b/tests/net/webrequest.cpp @@ -247,24 +247,14 @@ TEST_CASE_METHOD(RequestFixture, if ( !InitBaseURL() ) return; - // We can't use the same httpbin.org server that we use for the other tests - // for this one because it doesn't return anything in the body when - // returning an error status code, so use another one. - CreateAbs("https://httpstat.us/418"); + Create("/status/418"); Run(wxWebRequest::State_Failed, 0); - // For some reason, this test doesn't work with libcurl included in Ubuntu - // 14.04, so skip it. - const int status = request.GetResponse().GetStatus(); - if ( status == 0 ) - { - WARN("Status code not returned."); - } - else - { - CHECK( status == 418 ); - CHECK( request.GetResponse().AsString() == "418 I'm a teapot" ); - } + CHECK( request.GetResponse().GetStatus() == 418 ); + + const wxString& response = request.GetResponse().AsString(); + INFO( "Response: " << response); + CHECK( response.Contains("teapot") ); } TEST_CASE_METHOD(RequestFixture, From 623c4811abe80ad2bb4d6467b0395d2c45968cf6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 26 Jan 2021 22:50:43 +0100 Subject: [PATCH 08/18] Run httpbin in appveyor.yml to be able to stop it later There is no way to stop a background task simply and safely with cmd.exe, but in appveyor.yml we can use PowerShell, so use its job support to do it instead. This is important because AppVeyor waits until all jobs launched by the script terminate, so without stopping the background job all builds waited for an hour before timing out. --- appveyor.yml | 15 +++++++++++++++ build/tools/appveyor-test.bat | 9 --------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 29a18ef625..597caabdbf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -71,4 +71,19 @@ before_build: build_script: c:\projects\wxwidgets\build\tools\appveyor.bat +before_test: +- ps: | + Write-Output "Getting and launching httpbin." + pip install httpbin + Start-Job -Name wx_httpbin { python -m httpbin.core > c:\projects\wxwidgets\httpbin.log } + curl http://127.0.0.1:5000/ip + $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" + test_script: c:\projects\wxwidgets\build\tools\appveyor-test.bat + +after_test: +- ps: | + Stop-Job -Name wx_httpbin + Write-Output "--- httpbin output ---" + Get-Content c:\projects\wxwidgets\httpbin.log + Write-Output "--- httpbin output end ---" diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index 5100ef9e9d..f0319c16ed 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -1,12 +1,3 @@ -echo. -echo --- Running httpbin... -echo. - -pip install httpbin -start /b python -m httpbin.core -set WX_TEST_WEBREQUEST_URL=http://127.0.0.1:5000 -curl http://127.0.0.1:5000/ip - echo. echo --- Running tests. echo. From c625d2c001a3f2f54cb527d053483000ee353fef Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 09:16:23 +0100 Subject: [PATCH 09/18] Try using Python 3 with httpbin Use 3.5 which is currently available on all AppVeyor Windows images, see https://www.appveyor.com/docs/windows-images-software/#python --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 597caabdbf..a39a0115dd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,8 +74,8 @@ build_script: c:\projects\wxwidgets\build\tools\appveyor.bat before_test: - ps: | Write-Output "Getting and launching httpbin." - pip install httpbin - Start-Job -Name wx_httpbin { python -m httpbin.core > c:\projects\wxwidgets\httpbin.log } + C:\Python35\Scripts\pip.exe --disable-pip-version-check install httpbin + Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core > c:\projects\wxwidgets\httpbin.log } curl http://127.0.0.1:5000/ip $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" From 2eaa7a21b05017969a78198d65f47ad91cd8a356 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 09:49:03 +0100 Subject: [PATCH 10/18] Suppress pip warning about installing scripts not in PATH We don't care about it here, as we use full paths anyhow. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a39a0115dd..11516ab67f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,7 +74,7 @@ build_script: c:\projects\wxwidgets\build\tools\appveyor.bat before_test: - ps: | Write-Output "Getting and launching httpbin." - C:\Python35\Scripts\pip.exe --disable-pip-version-check install httpbin + C:\Python35\Scripts\pip.exe --disable-pip-version-check --no-warn-script-location install httpbin Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core > c:\projects\wxwidgets\httpbin.log } curl http://127.0.0.1:5000/ip $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" From b394bb1b87321da7dba9e3164055e2eab78d7c00 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 10:01:53 +0100 Subject: [PATCH 11/18] Show httpbin output if the test failed, not if it succeeded This output is mostly useful for diagnosing errors, so it's not very useful to show it only after successful test completion in after_test command. --- appveyor.yml | 3 --- build/tools/appveyor-test.bat | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 11516ab67f..271adefbc4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -84,6 +84,3 @@ test_script: c:\projects\wxwidgets\build\tools\appveyor-test.bat after_test: - ps: | Stop-Job -Name wx_httpbin - Write-Output "--- httpbin output ---" - Get-Content c:\projects\wxwidgets\httpbin.log - Write-Output "--- httpbin output end ---" diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index f0319c16ed..1a2e41566c 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -59,4 +59,7 @@ goto :eof echo. echo !!! Non-GUI test failed. echo. +echo --- httpbin output --- +type c:\projects\wxwidgets\httpbin.log +echo --- httpbin output end --- goto :eof From 4bdbbeca4af6d3df082c2d1bf633d91afd992ca5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 10:04:09 +0100 Subject: [PATCH 12/18] Redirect httpbin error output to the log file too This can be at least as useful as stdout. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 271adefbc4..7f18a6058e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -75,7 +75,7 @@ before_test: - ps: | Write-Output "Getting and launching httpbin." C:\Python35\Scripts\pip.exe --disable-pip-version-check --no-warn-script-location install httpbin - Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core > c:\projects\wxwidgets\httpbin.log } + Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } curl http://127.0.0.1:5000/ip $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" From 6a170343ae8244e404f7b9314a2219af9a637503 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 10:04:31 +0100 Subject: [PATCH 13/18] Disable the tests if launching httpbin failed for some reason This is not ideal, but will have to do for now. --- appveyor.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7f18a6058e..fb44705ca0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,8 +76,14 @@ before_test: Write-Output "Getting and launching httpbin." C:\Python35\Scripts\pip.exe --disable-pip-version-check --no-warn-script-location install httpbin Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } - curl http://127.0.0.1:5000/ip - $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" + Start-Sleep -Seconds 5 + if (curl -s http://127.0.0.1:5000/ip > $null) { + $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" + } + else { + Write-Error "Disabling wxWebRequest tests as launching httpbin failed." + $env:WX_TEST_WEBREQUEST_URL="0" + } test_script: c:\projects\wxwidgets\build\tools\appveyor-test.bat From cf65f47add0b72870624a03a3033908d60c08feb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 10:49:58 +0100 Subject: [PATCH 14/18] Revert "Suppress pip warning about installing scripts not in PATH" This reverts commit 2eaa7a21b05017969a78198d65f47ad91cd8a356 because the --no-warn-script-location option only exists in Python 3.9+ apparently and we don't want to require such a new version just for this. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fb44705ca0..02b4834139 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,7 +74,7 @@ build_script: c:\projects\wxwidgets\build\tools\appveyor.bat before_test: - ps: | Write-Output "Getting and launching httpbin." - C:\Python35\Scripts\pip.exe --disable-pip-version-check --no-warn-script-location install httpbin + C:\Python35\Scripts\pip.exe --disable-pip-version-check install httpbin Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } Start-Sleep -Seconds 5 if (curl -s http://127.0.0.1:5000/ip > $null) { From 99d088eec30268daee2ecab94fe99df7d2fe4db1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 11:11:20 +0100 Subject: [PATCH 15/18] Add Python scripts directory to PATH to avoid pip warnings They're really too annoying. --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 02b4834139..9ee5257449 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,8 +74,9 @@ build_script: c:\projects\wxwidgets\build\tools\appveyor.bat before_test: - ps: | Write-Output "Getting and launching httpbin." - C:\Python35\Scripts\pip.exe --disable-pip-version-check install httpbin - Start-Job -Name wx_httpbin { C:\Python35\python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } + $env:PATH = "C:\Python35;C:\Python35\Scripts;" + $env:PATH + pip.exe --disable-pip-version-check install httpbin + Start-Job -Name wx_httpbin { python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } Start-Sleep -Seconds 5 if (curl -s http://127.0.0.1:5000/ip > $null) { $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" From d59d51e0f2441f297df6c2d250af9b26ea998827 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 11:12:15 +0100 Subject: [PATCH 16/18] Use curl command, not PowerShell alias Aliasing curl to something completely different (Invoke-WebRequest) is just evil, yet this is what Powershell 3+ does. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9ee5257449..f85fe5f117 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,7 +78,7 @@ before_test: pip.exe --disable-pip-version-check install httpbin Start-Job -Name wx_httpbin { python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } Start-Sleep -Seconds 5 - if (curl -s http://127.0.0.1:5000/ip > $null) { + if (curl.exe -s http://127.0.0.1:5000/ip > $null) { $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" } else { From 04b9cee918a40185e8284e0f015e6d653f662185 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 11:30:18 +0100 Subject: [PATCH 17/18] Fix testing for curl success in PowerShell Of course doing the natural thing doesn't work in PowerShell. --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f85fe5f117..ea2ee57d66 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,7 +78,8 @@ before_test: pip.exe --disable-pip-version-check install httpbin Start-Job -Name wx_httpbin { python.exe -m httpbin.core 2>&1 > c:\projects\wxwidgets\httpbin.log } Start-Sleep -Seconds 5 - if (curl.exe -s http://127.0.0.1:5000/ip > $null) { + curl.exe -s http://127.0.0.1:5000/ip > $null + if ($lastExitCode -eq "0") { $env:WX_TEST_WEBREQUEST_URL="http://127.0.0.1:5000" } else { From 8e8a86aed0c4a43e26c6b374ae0c28b9bc8ba1ca Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Jan 2021 14:56:29 +0100 Subject: [PATCH 18/18] Fix return code from testing script in case of error Using type reset %errorlevel% and the errors were not detected any longer. --- build/tools/appveyor-test.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat index 1a2e41566c..dfe3a3898d 100755 --- a/build/tools/appveyor-test.bat +++ b/build/tools/appveyor-test.bat @@ -62,4 +62,4 @@ echo. echo --- httpbin output --- type c:\projects\wxwidgets\httpbin.log echo --- httpbin output end --- -goto :eof +exit /b 1