@@ -52,6 +52,41 @@ const boot_sources = [_][]const u8{
5252 "src/boot/table_test.c" ,
5353};
5454
55+ const test_scripts = [_ ][]const u8 {
56+ "test/suite-array.janet" ,
57+ "test/suite-asm.janet" ,
58+ "test/suite-boot.janet" ,
59+ "test/suite-buffer.janet" ,
60+ "test/suite-bundle.janet" ,
61+ "test/suite-capi.janet" ,
62+ "test/suite-cfuns.janet" ,
63+ "test/suite-compile.janet" ,
64+ "test/suite-corelib.janet" ,
65+ "test/suite-debug.janet" ,
66+ "test/suite-ev.janet" ,
67+ "test/suite-ev2.janet" ,
68+ "test/suite-ffi.janet" ,
69+ "test/suite-filewatch.janet" ,
70+ "test/suite-inttypes.janet" ,
71+ "test/suite-io.janet" ,
72+ "test/suite-marsh.janet" ,
73+ "test/suite-math.janet" ,
74+ "test/suite-os.janet" ,
75+ "test/suite-parse.janet" ,
76+ "test/suite-peg.janet" ,
77+ "test/suite-pp.janet" ,
78+ "test/suite-specials.janet" ,
79+ "test/suite-string.janet" ,
80+ "test/suite-strtod.janet" ,
81+ "test/suite-struct.janet" ,
82+ "test/suite-symcache.janet" ,
83+ "test/suite-table.janet" ,
84+ "test/suite-tuple.janet" ,
85+ "test/suite-unknown.janet" ,
86+ "test/suite-value.janet" ,
87+ "test/suite-vm.janet" ,
88+ };
89+
5590pub fn build (b : * std.Build ) void {
5691 const target = b .standardTargetOptions (.{});
5792 const optimize = b .standardOptimizeOption (.{});
@@ -169,28 +204,9 @@ pub fn build(b: *std.Build) void {
169204 });
170205 b .installArtifact (janet_static_library );
171206
172- const mod = b .addModule ("janet" , .{
173- .root_source_file = b .path ("src/root.zig" ),
174- .target = target ,
175- });
176-
177- const exe = b .addExecutable (.{
178- .name = "janet" ,
179- .root_module = b .createModule (.{
180- .root_source_file = b .path ("src/main.zig" ),
181- .target = target ,
182- .optimize = optimize ,
183- .imports = &.{
184- .{ .name = "janet" , .module = mod },
185- },
186- }),
187- });
188-
189- b .installArtifact (exe );
207+ const run_step = b .step ("run" , "Run the Janet REPL" );
190208
191- const run_step = b .step ("run" , "Run the app" );
192-
193- const run_cmd = b .addRunArtifact (exe );
209+ const run_cmd = b .addRunArtifact (janet_exe );
194210 run_step .dependOn (& run_cmd .step );
195211
196212 run_cmd .step .dependOn (b .getInstallStep ());
@@ -199,19 +215,10 @@ pub fn build(b: *std.Build) void {
199215 run_cmd .addArgs (args );
200216 }
201217
202- const mod_tests = b .addTest (.{
203- .root_module = mod ,
204- });
205-
206- const run_mod_tests = b .addRunArtifact (mod_tests );
207-
208- const exe_tests = b .addTest (.{
209- .root_module = exe .root_module ,
210- });
211-
212- const run_exe_tests = b .addRunArtifact (exe_tests );
213-
214218 const test_step = b .step ("test" , "Run tests" );
215- test_step .dependOn (& run_mod_tests .step );
216- test_step .dependOn (& run_exe_tests .step );
219+ for (test_scripts ) | test_script | {
220+ const run_test_cmd = b .addRunArtifact (janet_exe );
221+ run_test_cmd .addFileArg (b .path (test_script ));
222+ test_step .dependOn (& run_test_cmd .step );
223+ }
217224}
0 commit comments