authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-12 14:50:26-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-12 14:50:26-04:00
log869475c110c583e641c26f9dfe670132d2e0901e
tree733e5695865cd4c9e84af84df830d228982aee8a
parenta75753338657b85588fe6c54a40fecac0584b336
signaturelock-open Commit is signed but in an unrecognized format.

ci: skip release-small tests to save time

we keep hitting the limit on how long CI tests take to run.

4 files changed, 23 insertions(+), 10 deletions(-)

build.zig+20-7
...@@ -62,6 +62,9 @@ pub fn build(b: *Builder) !void {...@@ -62,6 +62,9 @@ pub fn build(b: *Builder) !void {
62 b.default_step.dependOn(&exe.step);62 b.default_step.dependOn(&exe.step);
6363
64 const skip_release = b.option(bool, "skip-release", "Main test suite skips release builds") orelse false;64 const skip_release = b.option(bool, "skip-release", "Main test suite skips release builds") orelse false;
65 const skip_release_small = b.option(bool, "skip-release-small", "Main test suite skips release-small builds") orelse skip_release;
66 const skip_release_fast = b.option(bool, "skip-release-fast", "Main test suite skips release-fast builds") orelse skip_release;
67 const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;
65 const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false;68 const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false;
66 if (!skip_self_hosted) {69 if (!skip_self_hosted) {
67 test_step.dependOn(&exe.step);70 test_step.dependOn(&exe.step);
...@@ -83,13 +86,23 @@ pub fn build(b: *Builder) !void {...@@ -83,13 +86,23 @@ pub fn build(b: *Builder) !void {
83 test_step.dependOn(test_stage2_step);86 test_step.dependOn(test_stage2_step);
84 }87 }
8588
86 const all_modes = []builtin.Mode{89 var chosen_modes: [4]builtin.Mode = undefined;
87 builtin.Mode.Debug,90 var chosen_mode_index: usize = 0;
88 builtin.Mode.ReleaseSafe,91 chosen_modes[chosen_mode_index] = builtin.Mode.Debug;
89 builtin.Mode.ReleaseFast,92 chosen_mode_index += 1;
90 builtin.Mode.ReleaseSmall,93 if (!skip_release_safe) {
91 };94 chosen_modes[chosen_mode_index] = builtin.Mode.ReleaseSafe;
92 const modes = if (skip_release) []builtin.Mode{builtin.Mode.Debug} else all_modes;95 chosen_mode_index += 1;
96 }
97 if (!skip_release_fast) {
98 chosen_modes[chosen_mode_index] = builtin.Mode.ReleaseFast;
99 chosen_mode_index += 1;
100 }
101 if (!skip_release_small) {
102 chosen_modes[chosen_mode_index] = builtin.Mode.ReleaseSmall;
103 chosen_mode_index += 1;
104 }
105 const modes = chosen_modes[0..chosen_mode_index];
93106
94 test_step.dependOn(tests.addPkgTests(b, test_filter, "test/behavior.zig", "behavior", "Run the behavior tests", modes));107 test_step.dependOn(tests.addPkgTests(b, test_filter, "test/behavior.zig", "behavior", "Run the behavior tests", modes));
95108
ci/appveyor/build_script.bat+1-1
...@@ -23,4 +23,4 @@ cd %ZIGBUILDDIR%...@@ -23,4 +23,4 @@ cd %ZIGBUILDDIR%
23cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b23cmake.exe .. -Thost=x64 -G"Visual Studio 14 2015 Win64" "-DCMAKE_INSTALL_PREFIX=%ZIGBUILDDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b
24msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b24msbuild /p:Configuration=Release INSTALL.vcxproj || exit /b
2525
26bin\zig.exe build --build-file ..\build.zig test || exit /b26bin\zig.exe build --build-file ..\build.zig test -Dskip-release-small || exit /b
ci/travis_linux_script+1-1
...@@ -10,7 +10,7 @@ mkdir build...@@ -10,7 +10,7 @@ mkdir build
10cd build10cd build
11cmake .. -DCMAKE_BUILD_TYPE=Release11cmake .. -DCMAKE_BUILD_TYPE=Release
12make -j2 install12make -j2 install
13./zig build --build-file ../build.zig test13./zig build --build-file ../build.zig test -Dskip-release-small
1414
15if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then15if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
16 mkdir $TRAVIS_BUILD_DIR/artifacts16 mkdir $TRAVIS_BUILD_DIR/artifacts
ci/travis_osx_script+1-1
...@@ -9,4 +9,4 @@ cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_BUILD_TYPE=Release...@@ -9,4 +9,4 @@ cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@6/ -DCMAKE_BUILD_TYPE=Release
9make VERBOSE=19make VERBOSE=1
10make install10make install
1111
12./zig build --build-file ../build.zig test12./zig build --build-file ../build.zig test -Dskip-release-small