authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-12-19 14:52:12-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-12-20 15:08:59-07:00
loge00b6db2aa2e3aa7e61c4b1ccebf4ebdb6e2d45a
tree5221e29289380554adab90f18110eb87590ede9a
parentaa6ef10cc657e2bbe59c362f27d7a557c43d7fae

update stage2 test harness to new std.Progress API

1 files changed, 12 insertions(+), 12 deletions(-)

src/test.zig+12-12
...@@ -578,12 +578,12 @@ pub const TestContext = struct {...@@ -578,12 +578,12 @@ pub const TestContext = struct {
578 update_node.activate();578 update_node.activate();
579 defer update_node.end();579 defer update_node.end();
580580
581 var sync_node = update_node.start("write", null);581 var sync_node = update_node.start("write", 0);
582 sync_node.activate();582 sync_node.activate();
583 try tmp.dir.writeFile(tmp_src_path, update.src);583 try tmp.dir.writeFile(tmp_src_path, update.src);
584 sync_node.end();584 sync_node.end();
585585
586 var module_node = update_node.start("parse/analysis/codegen", null);586 var module_node = update_node.start("parse/analysis/codegen", 0);
587 module_node.activate();587 module_node.activate();
588 try comp.makeBinFileWritable();588 try comp.makeBinFileWritable();
589 try comp.update();589 try comp.update();
...@@ -635,21 +635,21 @@ pub const TestContext = struct {...@@ -635,21 +635,21 @@ pub const TestContext = struct {
635 }635 }
636 }636 }
637 } else {637 } else {
638 update_node.estimated_total_items = 5;638 update_node.setEstimatedTotalItems(5);
639 var emit_node = update_node.start("emit", null);639 var emit_node = update_node.start("emit", 0);
640 emit_node.activate();640 emit_node.activate();
641 var new_zir_module = try zir.emit(allocator, comp.bin_file.options.module.?);641 var new_zir_module = try zir.emit(allocator, comp.bin_file.options.module.?);
642 defer new_zir_module.deinit(allocator);642 defer new_zir_module.deinit(allocator);
643 emit_node.end();643 emit_node.end();
644644
645 var write_node = update_node.start("write", null);645 var write_node = update_node.start("write", 0);
646 write_node.activate();646 write_node.activate();
647 var out_zir = std.ArrayList(u8).init(allocator);647 var out_zir = std.ArrayList(u8).init(allocator);
648 defer out_zir.deinit();648 defer out_zir.deinit();
649 try new_zir_module.writeToStream(allocator, out_zir.outStream());649 try new_zir_module.writeToStream(allocator, out_zir.outStream());
650 write_node.end();650 write_node.end();
651651
652 var test_node = update_node.start("assert", null);652 var test_node = update_node.start("assert", 0);
653 test_node.activate();653 test_node.activate();
654 defer test_node.end();654 defer test_node.end();
655655
...@@ -666,7 +666,7 @@ pub const TestContext = struct {...@@ -666,7 +666,7 @@ pub const TestContext = struct {
666 }666 }
667 },667 },
668 .Error => |e| {668 .Error => |e| {
669 var test_node = update_node.start("assert", null);669 var test_node = update_node.start("assert", 0);
670 test_node.activate();670 test_node.activate();
671 defer test_node.end();671 defer test_node.end();
672 var handled_errors = try arena.alloc(bool, e.len);672 var handled_errors = try arena.alloc(bool, e.len);
...@@ -723,9 +723,9 @@ pub const TestContext = struct {...@@ -723,9 +723,9 @@ pub const TestContext = struct {
723 .Execution => |expected_stdout| {723 .Execution => |expected_stdout| {
724 std.debug.assert(!case.cbe);724 std.debug.assert(!case.cbe);
725725
726 update_node.estimated_total_items = 4;726 update_node.setEstimatedTotalItems(4);
727 var exec_result = x: {727 var exec_result = x: {
728 var exec_node = update_node.start("execute", null);728 var exec_node = update_node.start("execute", 0);
729 exec_node.activate();729 exec_node.activate();
730 defer exec_node.end();730 defer exec_node.end();
731731
...@@ -788,7 +788,7 @@ pub const TestContext = struct {...@@ -788,7 +788,7 @@ pub const TestContext = struct {
788 .cwd_dir = tmp.dir,788 .cwd_dir = tmp.dir,
789 });789 });
790 };790 };
791 var test_node = update_node.start("test", null);791 var test_node = update_node.start("test", 0);
792 test_node.activate();792 test_node.activate();
793 defer test_node.end();793 defer test_node.end();
794 defer allocator.free(exec_result.stdout);794 defer allocator.free(exec_result.stdout);
...@@ -867,7 +867,7 @@ pub const TestContext = struct {...@@ -867,7 +867,7 @@ pub const TestContext = struct {
867 };867 };
868868
869 {869 {
870 var load_node = update_node.start("load", null);870 var load_node = update_node.start("load", 0);
871 load_node.activate();871 load_node.activate();
872 defer load_node.end();872 defer load_node.end();
873873
...@@ -905,7 +905,7 @@ pub const TestContext = struct {...@@ -905,7 +905,7 @@ pub const TestContext = struct {
905 }905 }
906 }906 }
907907
908 var exec_node = update_node.start("execute", null);908 var exec_node = update_node.start("execute", 0);
909 exec_node.activate();909 exec_node.activate();
910 defer exec_node.end();910 defer exec_node.end();
911911