aboutsummaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2016-02-03 23:07:55 -0700
committerAndrew Kelley <superjoe30@gmail.com>2016-02-03 23:07:55 -0700
commita6d43352175ac49ee180592055d56101fe20b83a (patch)
tree856e068887477d3b6cb07e97bd66f14182230bbd /std
parent2521afef699d40917db906ebb27a87c5ea287fbe (diff)
downloadzig-a6d43352175ac49ee180592055d56101fe20b83a.tar.gz
zig-a6d43352175ac49ee180592055d56101fe20b83a.zip
fix running tests when linking with libc
Diffstat (limited to 'std')
-rw-r--r--std/test_runner.zig2
-rw-r--r--std/test_runner_libc.zig6
-rw-r--r--std/test_runner_nolibc.zig5
3 files changed, 12 insertions, 1 deletions
diff --git a/std/test_runner.zig b/std/test_runner.zig
index 3ad1a9c3b9..da407035fc 100644
--- a/std/test_runner.zig
+++ b/std/test_runner.zig
@@ -7,7 +7,7 @@ struct TestFn {
extern var zig_test_fn_list: []TestFn;
-pub fn main(args: [][]u8) -> %void {
+pub fn run_tests() -> %void {
for (test_fn, zig_test_fn_list, i) {
%%stderr.print_str("Test ");
%%stderr.print_i64(i + 1);
diff --git a/std/test_runner_libc.zig b/std/test_runner_libc.zig
new file mode 100644
index 0000000000..9f7c9e7faa
--- /dev/null
+++ b/std/test_runner_libc.zig
@@ -0,0 +1,6 @@
+import "test_runner.zig";
+
+export fn main(argc: c_int, argv: &&u8) -> c_int {
+ run_tests() %% return -1;
+ return 0;
+}
diff --git a/std/test_runner_nolibc.zig b/std/test_runner_nolibc.zig
new file mode 100644
index 0000000000..4e27ca551b
--- /dev/null
+++ b/std/test_runner_nolibc.zig
@@ -0,0 +1,5 @@
+import "test_runner.zig";
+
+pub fn main(args: [][]u8) -> %void {
+ return run_tests();
+}