Merge pull request #979 from zig-lang/test-release-small

andrewrk · web-flow · commit 7337029ce1a7 · 2018-05-03T11:47:22.000-04:00
add ReleaseSmall mode in zig tests
diff --git a/test/cases/coroutines.zig b/test/cases/coroutines.zig
@@ -219,8 +219,9 @@ async fn printTrace(p: promise->error!void) void {
         std.debug.assert(e == error.Fail);
         if (@errorReturnTrace()) |trace| {
             assert(trace.index == 1);
-        } else if (builtin.mode != builtin.Mode.ReleaseFast) {
-            @panic("expected return trace");
+        } else switch (builtin.mode) {
+            builtin.Mode.Debug, builtin.Mode.ReleaseSafe => @panic("expected return trace"),
+            builtin.Mode.ReleaseFast, builtin.Mode.ReleaseSmall => {},
         }
     };
 }
diff --git a/test/tests.zig b/test/tests.zig
@@ -152,7 +152,7 @@ pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []cons
     const step = b.step(b.fmt("test-{}", name), desc);
     for (test_targets) |test_target| {
         const is_native = (test_target.os == builtin.os and test_target.arch == builtin.arch);
-        for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast}) |mode| {
+        for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast, Mode.ReleaseSmall}) |mode| {
             for ([]bool{false, true}) |link_libc| {
                 if (link_libc and !is_native) {
                     // don't assume we have a cross-compiling libc set up
@@ -451,7 +451,7 @@ pub const CompareOutputContext = struct {
                 self.step.dependOn(&run_and_cmp_output.step);
             },
             Special.None => {
-                for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast}) |mode| {
+                for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast, Mode.ReleaseSmall}) |mode| {
                     const annotated_case_name = fmt.allocPrint(self.b.allocator, "{} {} ({})",
                         "compare-output", case.name, @tagName(mode)) catch unreachable;
                     if (self.test_filter) |filter| {
@@ -705,7 +705,7 @@ pub const CompileErrorContext = struct {
     pub fn addCase(self: &CompileErrorContext, case: &const TestCase) void {
         const b = self.b;
 
-        for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast}) |mode| {
+        for ([]Mode{Mode.Debug, Mode.ReleaseFast}) |mode| {
             const annotated_case_name = fmt.allocPrint(self.b.allocator, "compile-error {} ({})",
                 case.name, @tagName(mode)) catch unreachable;
             if (self.test_filter) |filter| {
@@ -773,7 +773,7 @@ pub const BuildExamplesContext = struct {
     pub fn addAllArgs(self: &BuildExamplesContext, root_src: []const u8, link_libc: bool) void {
         const b = self.b;
 
-        for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast}) |mode| {
+        for ([]Mode{Mode.Debug, Mode.ReleaseSafe, Mode.ReleaseFast, Mode.ReleaseSmall}) |mode| {
             const annotated_case_name = fmt.allocPrint(self.b.allocator, "build {} ({})",
                 root_src, @tagName(mode)) catch unreachable;
             if (self.test_filter) |filter| {

Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,9 @@ async fn printTrace(p: promise->error!void) void {`
`219`	`219`	`std.debug.assert(e == error.Fail);`
`220`	`220`	`if (@errorReturnTrace()) \|trace\| {`
`221`	`221`	`assert(trace.index == 1);`
`222`		`- } else if (builtin.mode != builtin.Mode.ReleaseFast) {`
`223`		`- @panic("expected return trace");`
	`222`	`+ } else switch (builtin.mode) {`
	`223`	`+ builtin.Mode.Debug, builtin.Mode.ReleaseSafe => @panic("expected return trace"),`
	`224`	`+ builtin.Mode.ReleaseFast, builtin.Mode.ReleaseSmall => {},`
`224`	`225`	`}`
`225`	`226`	`};`
`226`	`227`	`}`