From be796e40a3c5797a304b1981a2a7fd321944d1c0 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 12 May 2020 22:33:16 +0200 Subject: [PATCH] Run WASI tests on Linux only --- ci/azure/macos_script | 2 +- ci/azure/windows_mingw_script | 2 +- ci/azure/windows_msvc_script.bat | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 7dd4344e3..37c65dab4 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -88,7 +88,7 @@ mkdir build cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$(pwd)/release -DZIG_STATIC=ON make $JOBS install -release/bin/zig build test +release/bin/zig build test -Dskip-wasi if [ "${BUILD_REASON}" != "PullRequest" ]; then mv ../LICENSE release/ diff --git a/ci/azure/windows_mingw_script b/ci/azure/windows_mingw_script index 788376642..2b261faf8 100644 --- a/ci/azure/windows_mingw_script +++ b/ci/azure/windows_mingw_script @@ -18,4 +18,4 @@ cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo $CMAKEFLAGS -DCMA make -j$(nproc) install -./zig build test-behavior -Dskip-non-native -Dskip-release +./zig build test-behavior -Dskip-non-native -Dskip-release -Dskip-wasi diff --git a/ci/azure/windows_msvc_script.bat b/ci/azure/windows_msvc_script.bat index b2063a8e5..f44b2385d 100644 --- a/ci/azure/windows_msvc_script.bat +++ b/ci/azure/windows_msvc_script.bat @@ -24,7 +24,7 @@ cd %ZIGBUILDDIR% cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b msbuild /maxcpucount /p:Configuration=Release INSTALL.vcxproj || exit /b -"%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b +"%ZIGINSTALLDIR%\bin\zig.exe" build test -Dskip-wasi || exit /b set "PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem" SET "MSYSTEM=MINGW64"