aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-02-03 18:38:09 -0700
committerAndrew Kelley <superjoe30@gmail.com>2016-02-03 18:38:09 -0700
commit39223c1847af19622db237d92e31c7be3cb805a2 (patch)
tree2f43fb18f14f932c50e4d93442e3939bf31010ac /std
parent11a06443659154ec53e4deb00956b2f025cd71ca (diff)
downloadzig-39223c1847af19622db237d92e31c7be3cb805a2.tar.gz
zig-39223c1847af19622db237d92e31c7be3cb805a2.zip
test runner prints test names
Diffstat (limited to 'std')
-rw-r--r--std/test_runner.zig22
1 files changed, 3 insertions, 19 deletions
diff --git a/std/test_runner.zig b/std/test_runner.zig
index e1a55b1388..356f2c72e7 100644
--- a/std/test_runner.zig
+++ b/std/test_runner.zig
@@ -1,45 +1,29 @@
import "std.zig";
-/*
struct TestFn {
name: []u8,
func: extern fn(),
}
-extern var test_fn_list: []TestFn;
-*/
-
-extern var zig_test_fn_count: isize;
-
-// TODO make this a slice of structs
-extern var zig_test_fn_list: [99999999]extern fn();
+extern var zig_test_fn_list: []TestFn;
pub fn main(args: [][]u8) -> %void {
- var i : isize = 0;
- while (i < zig_test_fn_count) {
+ for (test_fn, zig_test_fn_list, i) {
%%stderr.print_str("Test ");
// TODO get rid of the isize
%%stderr.print_i64(i + isize(1));
%%stderr.print_str("/");
- %%stderr.print_i64(zig_test_fn_count);
+ %%stderr.print_i64(zig_test_fn_list.len);
%%stderr.print_str(" ");
- /*
%%stderr.print_str(test_fn.name);
- */
%%stderr.print_str("...");
-/*
// TODO support calling function pointers as fields directly
const fn_ptr = test_fn.func;
fn_ptr();
- */
- const test_fn = zig_test_fn_list[i];
- test_fn();
%%stderr.print_str("OK\n");
%%stderr.flush();
-
- i += 1;
}
}