| author | |
| committer | |
| log | ca2e17e0a14b3bb63e9d1c75be7147357f87e9af |
| tree | 6c6dc9a6419f38b109c6b2cae75ee0403245c03b |
| parent | 50edad37ba745502174e49af922b179b1efdd99c |
2 files changed, 0 insertions(+), 11 deletions(-)
src/Compilation.zig-5| ... | @@ -255,7 +255,6 @@ mutex: if (builtin.single_threaded) struct { | ... | @@ -255,7 +255,6 @@ mutex: if (builtin.single_threaded) struct { |
| 255 | } else std.Thread.Mutex = .{}, | 255 | } else std.Thread.Mutex = .{}, |
| 256 | 256 | ||
| 257 | test_filters: []const []const u8, | 257 | test_filters: []const []const u8, |
| 258 | test_name_prefix: ?[]const u8, | ||
| 259 | 258 | ||
| 260 | link_task_wait_group: WaitGroup = .{}, | 259 | link_task_wait_group: WaitGroup = .{}, |
| 261 | link_prog_node: std.Progress.Node = std.Progress.Node.none, | 260 | link_prog_node: std.Progress.Node = std.Progress.Node.none, |
| ... | @@ -1766,7 +1765,6 @@ pub const CreateOptions = struct { | ... | @@ -1766,7 +1765,6 @@ pub const CreateOptions = struct { |
| 1766 | clang_preprocessor_mode: ClangPreprocessorMode = .no, | 1765 | clang_preprocessor_mode: ClangPreprocessorMode = .no, |
| 1767 | reference_trace: ?u32 = null, | 1766 | reference_trace: ?u32 = null, |
| 1768 | test_filters: []const []const u8 = &.{}, | 1767 | test_filters: []const []const u8 = &.{}, |
| 1769 | test_name_prefix: ?[]const u8 = null, | ||
| 1770 | test_runner_path: ?[]const u8 = null, | 1768 | test_runner_path: ?[]const u8 = null, |
| 1771 | subsystem: ?std.Target.SubSystem = null, | 1769 | subsystem: ?std.Target.SubSystem = null, |
| 1772 | mingw_unicode_entry_point: bool = false, | 1770 | mingw_unicode_entry_point: bool = false, |
| ... | @@ -2266,7 +2264,6 @@ pub fn create(gpa: Allocator, arena: Allocator, diag: *CreateDiagnostic, options | ... | @@ -2266,7 +2264,6 @@ pub fn create(gpa: Allocator, arena: Allocator, diag: *CreateDiagnostic, options |
| 2266 | .time_report = if (options.time_report) .init else null, | 2264 | .time_report = if (options.time_report) .init else null, |
| 2267 | .stack_report = options.stack_report, | 2265 | .stack_report = options.stack_report, |
| 2268 | .test_filters = options.test_filters, | 2266 | .test_filters = options.test_filters, |
| 2269 | .test_name_prefix = options.test_name_prefix, | ||
| 2270 | .debug_compiler_runtime_libs = options.debug_compiler_runtime_libs, | 2267 | .debug_compiler_runtime_libs = options.debug_compiler_runtime_libs, |
| 2271 | .debug_compile_errors = options.debug_compile_errors, | 2268 | .debug_compile_errors = options.debug_compile_errors, |
| 2272 | .debug_incremental = options.debug_incremental, | 2269 | .debug_incremental = options.debug_incremental, |
| ... | @@ -2416,7 +2413,6 @@ pub fn create(gpa: Allocator, arena: Allocator, diag: *CreateDiagnostic, options | ... | @@ -2416,7 +2413,6 @@ pub fn create(gpa: Allocator, arena: Allocator, diag: *CreateDiagnostic, options |
| 2416 | hash.add(options.config.dll_export_fns); | 2413 | hash.add(options.config.dll_export_fns); |
| 2417 | hash.add(options.config.is_test); | 2414 | hash.add(options.config.is_test); |
| 2418 | hash.addListOfBytes(options.test_filters); | 2415 | hash.addListOfBytes(options.test_filters); |
| 2419 | hash.addOptionalBytes(options.test_name_prefix); | ||
| 2420 | hash.add(options.skip_linker_dependencies); | 2416 | hash.add(options.skip_linker_dependencies); |
| 2421 | hash.add(options.emit_h != .no); | 2417 | hash.add(options.emit_h != .no); |
| 2422 | hash.add(error_limit); | 2418 | hash.add(error_limit); |
| ... | @@ -3450,7 +3446,6 @@ fn addNonIncrementalStuffToCacheManifest( | ... | @@ -3450,7 +3446,6 @@ fn addNonIncrementalStuffToCacheManifest( |
| 3450 | 3446 | ||
| 3451 | // Synchronize with other matching comments: ZigOnlyHashStuff | 3447 | // Synchronize with other matching comments: ZigOnlyHashStuff |
| 3452 | man.hash.addListOfBytes(comp.test_filters); | 3448 | man.hash.addListOfBytes(comp.test_filters); |
| 3453 | man.hash.addOptionalBytes(comp.test_name_prefix); | ||
| 3454 | man.hash.add(comp.skip_linker_dependencies); | 3449 | man.hash.add(comp.skip_linker_dependencies); |
| 3455 | //man.hash.add(zcu.emit_h != .no); | 3450 | //man.hash.add(zcu.emit_h != .no); |
| 3456 | man.hash.add(zcu.error_limit); | 3451 | man.hash.add(zcu.error_limit); |
src/main.zig-6| ... | @@ -668,10 +668,8 @@ const usage_build_generic = | ... | @@ -668,10 +668,8 @@ const usage_build_generic = |
| 668 | \\ | 668 | \\ |
| 669 | \\Test Options: | 669 | \\Test Options: |
| 670 | \\ --test-filter [text] Skip tests that do not match any filter | 670 | \\ --test-filter [text] Skip tests that do not match any filter |
| 671 | \\ --test-name-prefix [text] Add prefix to all tests | ||
| 672 | \\ --test-cmd [arg] Specify test execution command one arg at a time | 671 | \\ --test-cmd [arg] Specify test execution command one arg at a time |
| 673 | \\ --test-cmd-bin Appends test binary path to test cmd args | 672 | \\ --test-cmd-bin Appends test binary path to test cmd args |
| 674 | \\ --test-evented-io Runs the test in evented I/O mode | ||
| 675 | \\ --test-no-exec Compiles test binary without running it | 673 | \\ --test-no-exec Compiles test binary without running it |
| 676 | \\ --test-runner [path] Specify a custom test runner | 674 | \\ --test-runner [path] Specify a custom test runner |
| 677 | \\ | 675 | \\ |
| ... | @@ -896,7 +894,6 @@ fn buildOutputType( | ... | @@ -896,7 +894,6 @@ fn buildOutputType( |
| 896 | var build_id: ?std.zig.BuildId = null; | 894 | var build_id: ?std.zig.BuildId = null; |
| 897 | var runtime_args_start: ?usize = null; | 895 | var runtime_args_start: ?usize = null; |
| 898 | var test_filters: std.ArrayListUnmanaged([]const u8) = .empty; | 896 | var test_filters: std.ArrayListUnmanaged([]const u8) = .empty; |
| 899 | var test_name_prefix: ?[]const u8 = null; | ||
| 900 | var test_runner_path: ?[]const u8 = null; | 897 | var test_runner_path: ?[]const u8 = null; |
| 901 | var override_local_cache_dir: ?[]const u8 = try EnvVar.ZIG_LOCAL_CACHE_DIR.get(arena); | 898 | var override_local_cache_dir: ?[]const u8 = try EnvVar.ZIG_LOCAL_CACHE_DIR.get(arena); |
| 902 | var override_global_cache_dir: ?[]const u8 = try EnvVar.ZIG_GLOBAL_CACHE_DIR.get(arena); | 899 | var override_global_cache_dir: ?[]const u8 = try EnvVar.ZIG_GLOBAL_CACHE_DIR.get(arena); |
| ... | @@ -1326,8 +1323,6 @@ fn buildOutputType( | ... | @@ -1326,8 +1323,6 @@ fn buildOutputType( |
| 1326 | create_module.libc_paths_file = args_iter.nextOrFatal(); | 1323 | create_module.libc_paths_file = args_iter.nextOrFatal(); |
| 1327 | } else if (mem.eql(u8, arg, "--test-filter")) { | 1324 | } else if (mem.eql(u8, arg, "--test-filter")) { |
| 1328 | try test_filters.append(arena, args_iter.nextOrFatal()); | 1325 | try test_filters.append(arena, args_iter.nextOrFatal()); |
| 1329 | } else if (mem.eql(u8, arg, "--test-name-prefix")) { | ||
| 1330 | test_name_prefix = args_iter.nextOrFatal(); | ||
| 1331 | } else if (mem.eql(u8, arg, "--test-runner")) { | 1326 | } else if (mem.eql(u8, arg, "--test-runner")) { |
| 1332 | test_runner_path = args_iter.nextOrFatal(); | 1327 | test_runner_path = args_iter.nextOrFatal(); |
| 1333 | } else if (mem.eql(u8, arg, "--test-cmd")) { | 1328 | } else if (mem.eql(u8, arg, "--test-cmd")) { |
| ... | @@ -3495,7 +3490,6 @@ fn buildOutputType( | ... | @@ -3495,7 +3490,6 @@ fn buildOutputType( |
| 3495 | .stack_report = stack_report, | 3490 | .stack_report = stack_report, |
| 3496 | .build_id = build_id, | 3491 | .build_id = build_id, |
| 3497 | .test_filters = test_filters.items, | 3492 | .test_filters = test_filters.items, |
| 3498 | .test_name_prefix = test_name_prefix, | ||
| 3499 | .test_runner_path = test_runner_path, | 3493 | .test_runner_path = test_runner_path, |
| 3500 | .cache_mode = cache_mode, | 3494 | .cache_mode = cache_mode, |
| 3501 | .subsystem = subsystem, | 3495 | .subsystem = subsystem, |