diff options
author | Daniel Black <daniel@linux.vnet.ibm.com> | 2017-11-18 00:05:22 +0800 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-12-25 12:00:52 +0100 |
commit | c3bd0b0301936d0dcd0918bb8c966c272610d61b (patch) | |
tree | afaa971eb7a5654dd0e5491755ead951a0a5960e /appveyor.yml | |
parent | e8182df1425321d67887359d481aaa18ad36e70f (diff) | |
download | mariadb-git-c3bd0b0301936d0dcd0918bb8c966c272610d61b.tar.gz |
Appveyor: apply feedback from wlad, timeout=4
PKG_CONFIG does not really work on Windows, Strawberry perl's uses mingw
libraries, which VS compiler cannot use,
BOOST not used.
Tests main.query_cache_debug and main.mdev-504 timed out on debug build
at 2 minutes so increase the timeout to 4 minutes.
Overall build time was 30 min 44 seconds so plenty of time currently.
Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
Diffstat (limited to 'appveyor.yml')
-rw-r--r-- | appveyor.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index bc4f4d83528..a005fc5a93f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: 10.2-{build} before_build: - md %APPVEYOR_BUILD_FOLDER%\win_build - cd %APPVEYOR_BUILD_FOLDER%\win_build -- cmake .. -G "Visual Studio 15 2017" -DBOOST_ROOT=C:\Libraries\boost_1_64_0 -DPKG_CONFIG_EXECUTABLE=C:\perl\bin\pkg-config -DBISON_EXECUTABLE=C:\cygwin\bin\bison +- cmake .. -G "Visual Studio 15 2017" -DBISON_EXECUTABLE=C:\cygwin\bin\bison - dir build: project: win_build\MySQL.sln @@ -13,5 +13,5 @@ configuration: test: test_script: - cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test -- perl mysql-test-run.pl --force --max-test-fail=20 --parallel=6 --testcase-timeout=2 --skip-test-list=unstable-tests --suite=main,innodb,plugins,mariabackup +- perl mysql-test-run.pl --force --max-test-fail=20 --parallel=6 --testcase-timeout=4 --skip-test-list=unstable-tests --suite=main,innodb,plugins,mariabackup image: Visual Studio 2017 |