From bb9165edd25aa4d8c5df514764a281a14ac79316 Mon Sep 17 00:00:00 2001
From: Jeroen van Rijn <Kelimion@users.noreply.github.com>
Date: Tue, 5 Apr 2022 20:45:00 +0200
Subject: [PATCH] Add -help to CI tests.

---
 src/main.cpp        | 12 ++++++++++--
 tests/core/Makefile | 18 +++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7dd82f173..fc8792ceb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2550,6 +2550,7 @@ int main(int arg_count, char const **arg_ptr) {
 	String command = args[1];
 	String init_filename = {};
 	String run_args_string = {};
+	isize  last_non_run_arg = args.count;
 
 	bool run_output = false;
 	if (command == "run" || command == "test") {
@@ -2565,7 +2566,6 @@ int main(int arg_count, char const **arg_ptr) {
 		Array<String> run_args = array_make<String>(heap_allocator(), 0, arg_count);
 		defer (array_free(&run_args));
 
-		isize last_non_run_arg = args.count;
 		for_array(i, args) {
 			if (args[i] == "--") {
 				last_non_run_arg = i;
@@ -2675,7 +2675,15 @@ int main(int arg_count, char const **arg_ptr) {
 		// The command must be build, run, test, check, or another that takes a directory or filename.
 		if (!path_is_directory(init_filename)) {
 			// Input package is a filename. We allow this only if `-file` was given, otherwise we exit with an error message.
-			if (!(args.count > 3 && args[3] == "-file")) {
+			bool single_file_package = false;
+			for_array(i, args) {
+				if (i >= 3 && i <= last_non_run_arg && args[i] == "-file") {
+					single_file_package = true;
+					break;
+				}
+			}
+
+			if (!single_file_package) {
 				gb_printf_err("ERROR: `%.*s %.*s` takes a package as its first argument.\n", LIT(args[0]), LIT(command));
 				gb_printf_err("Did you mean `%.*s %.*s %.*s -file`?\n", LIT(args[0]), LIT(command), LIT(init_filename));
 				gb_printf_err("The `-file` flag tells it to treat a file as a self-contained package.\n");
diff --git a/tests/core/Makefile b/tests/core/Makefile
index 652ebb151..6a92b4efb 100644
--- a/tests/core/Makefile
+++ b/tests/core/Makefile
@@ -8,19 +8,19 @@ download_test_assets:
 	$(PYTHON) download_assets.py
 
 image_test:
-	$(ODIN) run image/test_core_image.odin
+	$(ODIN) run image/test_core_image.odin -file
 
 compress_test:
-	$(ODIN) run compress/test_core_compress.odin
+	$(ODIN) run compress/test_core_compress.odin -file
 
 strings_test:
-	$(ODIN) run strings/test_core_strings.odin
+	$(ODIN) run strings/test_core_strings.odin -file
 
 hash_test:
 	$(ODIN) run hash -out=test_hash -o:speed -no-bounds-check
 
 crypto_test:
-	$(ODIN) run crypto -out=crypto_hash -o:speed -no-bounds-check
+	$(ODIN) run crypto -out=test_crypto_hash -o:speed -no-bounds-check
 
 noise_test:
 	$(ODIN) run math/noise -out=test_noise
@@ -31,16 +31,16 @@ encoding_test:
 	$(ODIN) run encoding/varint -out=test_varint
 
 math_test:
-	$(ODIN) run math/test_core_math.odin -out=test_core_math -collection:tests=..
+	$(ODIN) run math/test_core_math.odin -out=test_core_math -file -collection:tests=..
 
 linalg_glsl_math_test:
-	$(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -out=test_linalg_glsl_math -collection:tests=..
+	$(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=test_linalg_glsl_math -collection:tests=..
 
 filepath_test:
-	$(ODIN) run path/filepath/test_core_filepath.odin -out=test_core_filepath -collection:tests=..
+	$(ODIN) run path/filepath/test_core_filepath.odin -file -out=test_core_filepath -collection:tests=..
 
 reflect_test:
-	$(ODIN) run reflect/test_core_reflect.odin -out=test_core_reflect -collection:tests=..
+	$(ODIN) run reflect/test_core_reflect.odin -file -out=test_core_reflect -collection:tests=..
 
 os_exit_test:
-	$(ODIN) run os/test_core_os_exit.odin -out=test_core_os_exit && exit 1 || exit 0
+	$(ODIN) run os/test_core_os_exit.odin -file -out=test_core_os_exit && exit 1 || exit 0