authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-09-17 14:43:51-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-09-17 14:43:51-04:00
log7ee00730ac5679ea5e24fac352ed9b72469f9329
treef05bee8200126abc3fe9b4ac019357fe239078e2
parenta9ecb26c34d77f616fb029af3d09ffd69b9aa178

add option to run tests in LLDB and turn it on for macos travis

5 files changed, 58 insertions(+), 11 deletions(-)

build.zig+7-3
......@@ -3,16 +3,20 @@ const tests = @import("test/tests.zig");
33
44pub fn build(b: &Builder) {
55 const test_filter = b.option([]const u8, "test-filter", "Skip tests that do not match filter");
6 const with_lldb = b.option(bool, "with-lldb", "Run tests in LLDB to get a backtrace if one fails") ?? false;
67 const test_step = b.step("test", "Run all the tests");
78
89 test_step.dependOn(tests.addPkgTests(b, test_filter,
9 "test/behavior.zig", "behavior", "Run the behavior tests"));
10 "test/behavior.zig", "behavior", "Run the behavior tests",
11 with_lldb));
1012
1113 test_step.dependOn(tests.addPkgTests(b, test_filter,
12 "std/index.zig", "std", "Run the standard library tests"));
14 "std/index.zig", "std", "Run the standard library tests",
15 with_lldb));
1316
1417 test_step.dependOn(tests.addPkgTestsAlwaysLibc(b, test_filter,
15 "std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests"));
18 "std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests",
19 with_lldb));
1620
1721 test_step.dependOn(tests.addCompareOutputTests(b, test_filter));
1822 test_step.dependOn(tests.addBuildExampleTests(b, test_filter));
ci/travis_osx_script+1-1
......@@ -7,4 +7,4 @@ cd build
77cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@5/ -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o))
88make VERBOSE=1
99make install
10./zig build --build-file ../build.zig test
10./zig build --build-file ../build.zig test -Dwith-lldb
src/main.cpp+24-2
......@@ -75,6 +75,8 @@ static int usage(const char *arg0) {
7575 "Test Options:\n"
7676 " --test-filter [text] skip tests that do not match filter\n"
7777 " --test-name-prefix [text] add prefix to all tests\n"
78 " --test-cmd [arg] specify test execution command one arg at a time\n"
79 " --test-cmd-bin appends test binary path to test cmd args\n"
7880 , arg0);
7981 return EXIT_FAILURE;
8082}
......@@ -215,6 +217,7 @@ int main(int argc, char **argv) {
215217 const char *cache_dir = nullptr;
216218 CliPkg *cur_pkg = allocate<CliPkg>(1);
217219 BuildMode build_mode = BuildModeDebug;
220 ZigList<const char *> test_exec_args = {0};
218221
219222 if (argc >= 2 && strcmp(argv[1], "build") == 0) {
220223 const char *zig_exe_path = arg0;
......@@ -355,6 +358,8 @@ int main(int argc, char **argv) {
355358 each_lib_rpath = true;
356359 } else if (strcmp(arg, "--enable-timing-info") == 0) {
357360 timing_info = true;
361 } else if (strcmp(arg, "--test-cmd-bin") == 0) {
362 test_exec_args.append(nullptr);
358363 } else if (arg[1] == 'L' && arg[2] != 0) {
359364 // alias for --library-path
360365 lib_dirs.append(&arg[2]);
......@@ -451,6 +456,8 @@ int main(int argc, char **argv) {
451456 ver_minor = atoi(argv[i]);
452457 } else if (strcmp(arg, "--ver-patch") == 0) {
453458 ver_patch = atoi(argv[i]);
459 } else if (strcmp(arg, "--test-cmd") == 0) {
460 test_exec_args.append(argv[i]);
454461 } else {
455462 fprintf(stderr, "Invalid argument: %s\n", arg);
456463 return usage(arg0);
......@@ -682,6 +689,12 @@ int main(int argc, char **argv) {
682689
683690 Buf *test_exe_name = buf_sprintf("./test%s", target_exe_file_ext(non_null_target));
684691
692 for (size_t i = 0; i < test_exec_args.length; i += 1) {
693 if (test_exec_args.items[i] == nullptr) {
694 test_exec_args.items[i] = buf_ptr(test_exe_name);
695 }
696 }
697
685698 codegen_build(g);
686699 codegen_link(g, buf_ptr(test_exe_name));
687700
......@@ -693,9 +706,18 @@ int main(int argc, char **argv) {
693706 return 0;
694707 }
695708
696 ZigList<const char *> args = {0};
697709 Termination term;
698 os_spawn_process(buf_ptr(test_exe_name), args, &term);
710 if (test_exec_args.length > 0) {
711 ZigList<const char *> rest_args = {0};
712 for (size_t i = 1; i < test_exec_args.length; i += 1) {
713 rest_args.append(test_exec_args.at(i));
714 }
715 os_spawn_process(test_exec_args.items[0], rest_args, &term);
716 } else {
717 ZigList<const char *> no_args = {0};
718 os_spawn_process(buf_ptr(test_exe_name), no_args, &term);
719 }
720
699721 if (term.how != TerminationIdClean || term.code != 0) {
700722 fprintf(stderr, "\nTests failed. Use the following command to reproduce the failure:\n");
701723 fprintf(stderr, "%s\n", buf_ptr(test_exe_name));
std/build.zig+17
......@@ -1028,6 +1028,7 @@ pub const TestStep = struct {
10281028 name_prefix: []const u8,
10291029 filter: ?[]const u8,
10301030 target: Target,
1031 exec_cmd_args: ?[]const ?[]const u8,
10311032
10321033 pub fn init(builder: &Builder, root_src: []const u8) -> TestStep {
10331034 const step_name = builder.fmt("test {}", root_src);
......@@ -1041,6 +1042,7 @@ pub const TestStep = struct {
10411042 .filter = null,
10421043 .link_libs = BufSet.init(builder.allocator),
10431044 .target = Target.Native,
1045 .exec_cmd_args = null,
10441046 }
10451047 }
10461048
......@@ -1076,6 +1078,10 @@ pub const TestStep = struct {
10761078 };
10771079 }
10781080
1081 pub fn setExecCmd(self: &TestStep, args: []const ?[]const u8) {
1082 self.exec_cmd_args = args;
1083 }
1084
10791085 fn make(step: &Step) -> %void {
10801086 const self = @fieldParentPtr(TestStep, "step", step);
10811087 const builder = self.builder;
......@@ -1129,6 +1135,17 @@ pub const TestStep = struct {
11291135 }
11301136 }
11311137
1138 if (self.exec_cmd_args) |exec_cmd_args| {
1139 for (exec_cmd_args) |cmd_arg| {
1140 if (cmd_arg) |arg| {
1141 %%zig_args.append("--test-cmd");
1142 %%zig_args.append(arg);
1143 } else {
1144 %%zig_args.append("--test-cmd-bin");
1145 }
1146 }
1147 }
1148
11321149 for (builder.include_paths.toSliceConst()) |include_path| {
11331150 %%zig_args.append("-isystem");
11341151 %%zig_args.append(builder.pathFromRoot(include_path));
test/tests.zig+9-5
......@@ -130,19 +130,19 @@ pub fn addParseCTests(b: &build.Builder, test_filter: ?[]const u8) -> &build.Ste
130130}
131131
132132pub fn addPkgTests(b: &build.Builder, test_filter: ?[]const u8, root_src: []const u8,
133 name:[] const u8, desc: []const u8) -> &build.Step
133 name:[] const u8, desc: []const u8, with_lldb: bool) -> &build.Step
134134{
135 return addPkgTestsRaw(b, test_filter, root_src, name, desc, false);
135 return addPkgTestsRaw(b, test_filter, root_src, name, desc, false, with_lldb);
136136}
137137
138138pub fn addPkgTestsAlwaysLibc(b: &build.Builder, test_filter: ?[]const u8, root_src: []const u8,
139 name:[] const u8, desc: []const u8) -> &build.Step
139 name:[] const u8, desc: []const u8, with_lldb: bool) -> &build.Step
140140{
141 return addPkgTestsRaw(b, test_filter, root_src, name, desc, true);
141 return addPkgTestsRaw(b, test_filter, root_src, name, desc, true, with_lldb);
142142}
143143
144144pub fn addPkgTestsRaw(b: &build.Builder, test_filter: ?[]const u8, root_src: []const u8,
145 name:[] const u8, desc: []const u8, always_link_libc: bool) -> &build.Step
145 name:[] const u8, desc: []const u8, always_link_libc: bool, with_lldb: bool) -> &build.Step
146146{
147147 const libc_bools = if (always_link_libc) []bool{true} else []bool{false, true};
148148 const step = b.step(b.fmt("test-{}", name), desc);
......@@ -165,6 +165,10 @@ pub fn addPkgTestsRaw(b: &build.Builder, test_filter: ?[]const u8, root_src: []c
165165 if (link_libc) {
166166 these_tests.linkSystemLibrary("c");
167167 }
168 if (with_lldb) {
169 these_tests.setExecCmd([]?[]const u8{
170 "lldb", null, "-o", "run", "-o", "bt", "-o", "exit"});
171 }
168172 step.dependOn(&these_tests.step);
169173 }
170174 }