mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-01 00:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak #5202

Browse Source 
Back out the new `-build-only` for tests in favor of the more established `-build-mode:test`, but retain the new `-keep-test-executable` option and default cleanup of test executables.
This commit is contained in:
Jeroen van Rijn
2025-05-23 08:28:27 +02:00
parent 1886c7df0a
commit 12167bace0
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.cpp
View File

@@ -312,7 +312,6 @@ enum BuildFlagKind {
BuildFlag_Collection,
BuildFlag_Define,
BuildFlag_BuildMode,
BuildFlag_BuildOnly,
BuildFlag_KeepTestExecutable,
BuildFlag_Target,
BuildFlag_Subtarget,
@@ -533,7 +532,6 @@ gb_internal bool parse_build_flags(Array<String> args) {
add_flag(&build_flags, BuildFlag_Collection, str_lit("collection"), BuildFlagParam_String, Command__does_check);
add_flag(&build_flags, BuildFlag_Define, str_lit("define"), BuildFlagParam_String, Command__does_check, true);
add_flag(&build_flags, BuildFlag_BuildMode, str_lit("build-mode"), BuildFlagParam_String, Command__does_build); // Commands_build is not used to allow for a better error message
add_flag(&build_flags, BuildFlag_BuildOnly, str_lit("build-only"), BuildFlagParam_None, Command_test);
add_flag(&build_flags, BuildFlag_KeepTestExecutable, str_lit("keep-test-executable"), BuildFlagParam_None, Command_test);
add_flag(&build_flags, BuildFlag_Target, str_lit("target"), BuildFlagParam_String, Command__does_check);
add_flag(&build_flags, BuildFlag_Subtarget, str_lit("subtarget"), BuildFlagParam_String, Command__does_check);
@@ -1197,23 +1195,8 @@ gb_internal bool parse_build_flags(Array<String> args) {
break;
}
case BuildFlag_BuildOnly:
if (build_context.keep_test_executable) {
gb_printf_err("`-keep-test-executable` is mutually exclusive with `-build-only`.\n");
gb_printf_err("We either only build or run the test and optionally keep the executable.\n");
bad_flags = true;
} else {
build_context.build_only = true;
}
break;
case BuildFlag_KeepTestExecutable:
if (build_context.build_only) {
gb_printf_err("`-build-only` is mutually exclusive with `-keep-test-executable`.\n");
gb_printf_err("We either only build or run the test and optionally keep the executable.\n");
bad_flags = true;
} else {
build_context.keep_test_executable = true;
}
build_context.keep_test_executable = true;
break;
case BuildFlag_Debug:
@@ -2573,7 +2556,9 @@ gb_internal int print_show_help(String const arg0, String command, String option
if (test_only) {
if (print_flag("-keep-test-executable")) {
print_usage_line(2, "Keep the test executable after running it instead of deleting it normally.");
print_usage_line(2, "Keep the test executable after running it with `odin test`, instead of deleting it after the test completes.");
print_usage_line(2, "If you build your your tests using `odin build <package> -build-mode:test`, the compiler does not execute");
print_usage_line(2, "the resulting test program, and this option is not applicable.");
}
}
@@ -3895,7 +3880,7 @@ end_of_code_gen:;
show_timings(checker, &global_timings);
}
if (!build_context.build_only && run_output) {
if (run_output) {
String exe_name = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Output]);
defer (gb_free(heap_allocator(), exe_name.text));