1 files changed, 55 insertions, 50 deletions

diff --git a/tests/core/Makefile b/tests/core/Makefile
index 9026ed3d9..85f3783b4 100644
--- a/tests/core/Makefile
+++ b/tests/core/Makefile
@@ -1,16 +1,15 @@
 ODIN=../../odin
 PYTHON=$(shell which python3)
-COMMON=-vet -strict-style
-COLLECTION=-collection:tests=..
+COMMON=-no-bounds-check -vet -strict-style -define:ODIN_TEST_FANCY=false
 
 all: all_bsd \
      net_test
 
-all_bsd: c_libc_test \
+all_bsd: download_test_assets \
+         c_libc_test \
          compress_test \
          container_test \
          crypto_test \
-         download_test_assets \
          encoding_test \
          filepath_test \
          fmt_test \
@@ -21,86 +20,92 @@ all_bsd: c_libc_test \
          match_test \
          math_test \
          noise_test \
+         odin_test \
          os_exit_test \
          reflect_test \
+         runtime_test \
          slice_test \
          strings_test \
          thread_test \
-         runtime_test \
-         time_test \
-         fmt_test
+         time_test
 
 download_test_assets:
 	$(PYTHON) download_assets.py
 
-image_test:
-	$(ODIN) run image $(COMMON) -out:test_core_image
+c_libc_test:
+	$(ODIN) test c/libc $(COMMON) -out:test_core_libc
 
 compress_test:
-	$(ODIN) run compress $(COMMON) -out:test_core_compress
+	$(ODIN) test compress $(COMMON) -out:test_core_compress
 
 container_test:
-	$(ODIN) run container $(COMMON) $(COLLECTION) -out:test_core_container
+	$(ODIN) test container $(COMMON) -out:test_core_container
 
-strings_test:
-	$(ODIN) run strings $(COMMON) -out:test_core_strings
+crypto_test:
+	$(ODIN) test crypto $(COMMON) -o:speed -out:test_crypto
+
+encoding_test:
+	$(ODIN) test encoding/base64 $(COMMON) -out:test_base64
+	$(ODIN) test encoding/cbor   $(COMMON) -out:test_cbor
+	$(ODIN) test encoding/hex    $(COMMON) -out:test_hex
+	$(ODIN) test encoding/hxa    $(COMMON) -out:test_hxa
+	$(ODIN) test encoding/json   $(COMMON) -out:test_json
+	$(ODIN) test encoding/varint $(COMMON) -out:test_varint
+	$(ODIN) test encoding/xml    $(COMMON) -out:test_xml
+
+filepath_test:
+	$(ODIN) test path/filepath $(COMMON) -out:test_core_filepath
+
+fmt_test:
+	$(ODIN) test fmt $(COMMON) -out:test_core_fmt
 
 hash_test:
-	$(ODIN) run hash $(COMMON) -o:speed -no-bounds-check -out:test_hash
+	$(ODIN) test hash $(COMMON) -o:speed -out:test_hash
 
-crypto_test:
-	$(ODIN) run crypto $(COMMON) $(COLLECTION) -o:speed -no-bounds-check -out:test_crypto
+image_test:
+	$(ODIN) test image $(COMMON) -out:test_core_image
 
-noise_test:
-	$(ODIN) run math/noise $(COMMON) -out:test_noise
+i18n_test:
+	$(ODIN) test text/i18n $(COMMON) -out:test_core_i18n
 
-encoding_test:
-	$(ODIN) run encoding/hxa    $(COMMON) $(COLLECTION) -out:test_hxa
-	$(ODIN) run encoding/json   $(COMMON) -out:test_json
-	$(ODIN) run encoding/varint $(COMMON) -out:test_varint
-	$(ODIN) run encoding/xml    $(COMMON) -out:test_xml
-	$(ODIN) run encoding/cbor   $(COMMON) -out:test_cbor
-	$(ODIN) run encoding/hex    $(COMMON) -out:test_hex
-	$(ODIN) run encoding/base64 $(COMMON) -out:test_base64
+match_test:
+	$(ODIN) test text/match $(COMMON) -out:test_core_match
 
 math_test:
-	$(ODIN) run math $(COMMON) $(COLLECTION) -out:test_core_math
+	$(ODIN) test math $(COMMON) -out:test_core_math
 
 linalg_glsl_math_test:
-	$(ODIN) run math/linalg/glsl $(COMMON) $(COLLECTION) -out:test_linalg_glsl_math
+	$(ODIN) test math/linalg/glsl $(COMMON) -out:test_linalg_glsl_math
 
-filepath_test:
-	$(ODIN) run path/filepath $(COMMON) $(COLLECTION) -out:test_core_filepath
-
-reflect_test:
-	$(ODIN) run reflect $(COMMON) $(COLLECTION) -out:test_core_reflect
+noise_test:
+	$(ODIN) test math/noise $(COMMON) -out:test_noise
 
-slice_test:
-	$(ODIN) run slice $(COMMON) -out:test_core_slice
+net_test:
+	$(ODIN) test net $(COMMON) -out:test_core_net
 
 os_exit_test:
 	$(ODIN) run os/test_core_os_exit.odin -file -out:test_core_os_exit && exit 1 || exit 0
 
-i18n_test:
-	$(ODIN) run text/i18n $(COMMON) -out:test_core_i18n
+odin_test:
+	$(ODIN) test odin $(COMMON) -out:test_core_odin
 
-match_test:
-	$(ODIN) run text/match $(COMMON) -out:test_core_match
+reflect_test:
+	$(ODIN) test reflect $(COMMON) -out:test_core_reflect
 
-c_libc_test:
-	$(ODIN) run c/libc $(COMMON) -out:test_core_libc
+runtime_test:
+	$(ODIN) test runtime $(COMMON) -out:test_core_runtime
 
-net_test:
-	$(ODIN) run net $(COMMON) -out:test_core_net
+slice_test:
+	$(ODIN) test slice $(COMMON) -out:test_core_slice
 
-fmt_test:
-	$(ODIN) run fmt $(COMMON) -out:test_core_fmt
+strings_test:
+	$(ODIN) test strings $(COMMON) -out:test_core_strings
 
 thread_test:
-	$(ODIN) run thread $(COMMON) -out:test_core_thread
-
-runtime_test:
-	$(ODIN) run runtime $(COMMON) -out:test_core_runtime
+	$(ODIN) test thread $(COMMON) -out:test_core_thread
 
 time_test:
-	$(ODIN) run time $(COMMON) -out:test_core_time
+	$(ODIN) test time $(COMMON) -out:test_core_time
+
+clean:
+	rm test_*
\ No newline at end of file