aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJeroen van Rijn <Kelimion@users.noreply.github.com>2022-04-26 14:23:23 +0200
committerJeroen van Rijn <Kelimion@users.noreply.github.com>2022-04-26 14:23:23 +0200
commit5e11ad2e1e6d0e335f47197c63a5ffdd8f405dd7 (patch)
tree394bb2f19fd24e5dfbc9821669aa9b78a8f98a8a /tests
parenta5342a01267f55dec5a5b9f775cec8c8379139b1 (diff)
Update test paths.
Diffstat (limited to 'tests')
-rw-r--r--tests/core/Makefile28
-rw-r--r--tests/core/build.bat28
-rw-r--r--tests/issues/run.bat14
-rwxr-xr-xtests/issues/run.sh16
-rw-r--r--tests/vendor/Makefile2
-rw-r--r--tests/vendor/build.bat4
6 files changed, 46 insertions, 46 deletions
diff --git a/tests/core/Makefile b/tests/core/Makefile
index 6a92b4efb..2c24fef75 100644
--- a/tests/core/Makefile
+++ b/tests/core/Makefile
@@ -8,39 +8,39 @@ download_test_assets:
$(PYTHON) download_assets.py
image_test:
- $(ODIN) run image/test_core_image.odin -file
+ $(ODIN) run image/test_core_image.odin -file -out:test_core_image
compress_test:
- $(ODIN) run compress/test_core_compress.odin -file
+ $(ODIN) run compress/test_core_compress.odin -file -out:test_core_compress
strings_test:
- $(ODIN) run strings/test_core_strings.odin -file
+ $(ODIN) run strings/test_core_strings.odin -file -out:test_core_strings
hash_test:
- $(ODIN) run hash -out=test_hash -o:speed -no-bounds-check
+ $(ODIN) run hash -o:speed -no-bounds-check -out:test_hash
crypto_test:
- $(ODIN) run crypto -out=test_crypto_hash -o:speed -no-bounds-check
+ $(ODIN) run crypto -o:speed -no-bounds-check -out:test_crypto_hash
noise_test:
- $(ODIN) run math/noise -out=test_noise
+ $(ODIN) run math/noise -out:test_noise
encoding_test:
- $(ODIN) run encoding/hxa -out=test_hxa -collection:tests=..
- $(ODIN) run encoding/json -out=test_json
- $(ODIN) run encoding/varint -out=test_varint
+ $(ODIN) run encoding/hxa -collection:tests=.. -out:test_hxa
+ $(ODIN) run encoding/json -out:test_json
+ $(ODIN) run encoding/varint -out:test_varint
math_test:
- $(ODIN) run math/test_core_math.odin -out=test_core_math -file -collection:tests=..
+ $(ODIN) run math/test_core_math.odin -file -collection:tests=.. -out:test_core_math
linalg_glsl_math_test:
- $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -out=test_linalg_glsl_math -collection:tests=..
+ $(ODIN) run math/linalg/glsl/test_linalg_glsl_math.odin -file -collection:tests=.. -out:test_linalg_glsl_math
filepath_test:
- $(ODIN) run path/filepath/test_core_filepath.odin -file -out=test_core_filepath -collection:tests=..
+ $(ODIN) run path/filepath/test_core_filepath.odin -file -collection:tests=.. -out:test_core_filepath
reflect_test:
- $(ODIN) run reflect/test_core_reflect.odin -file -out=test_core_reflect -collection:tests=..
+ $(ODIN) run reflect/test_core_reflect.odin -file -collection:tests=.. -out:test_core_reflect
os_exit_test:
- $(ODIN) run os/test_core_os_exit.odin -file -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 \ No newline at end of file
diff --git a/tests/core/build.bat b/tests/core/build.bat
index 2f9ba672e..b03fef4bb 100644
--- a/tests/core/build.bat
+++ b/tests/core/build.bat
@@ -5,61 +5,61 @@ python3 download_assets.py
echo ---
echo Running core:image tests
echo ---
-%PATH_TO_ODIN% run image %COMMON%
+%PATH_TO_ODIN% run image %COMMON% -out:test_core_image.exe
echo ---
echo Running core:compress tests
echo ---
-%PATH_TO_ODIN% run compress %COMMON%
+%PATH_TO_ODIN% run compress %COMMON% -out:test_core_compress.exe
echo ---
echo Running core:strings tests
echo ---
-%PATH_TO_ODIN% run strings %COMMON%
+%PATH_TO_ODIN% run strings %COMMON% -out:test_core_strings.exe
echo ---
echo Running core:hash tests
echo ---
-%PATH_TO_ODIN% run hash %COMMON% -o:size
+%PATH_TO_ODIN% run hash %COMMON% -o:size -out:test_core_hash.exe
echo ---
echo Running core:odin tests
echo ---
-%PATH_TO_ODIN% run odin %COMMON% -o:size
+%PATH_TO_ODIN% run odin %COMMON% -o:size -out:test_core_odin.exe
echo ---
echo Running core:crypto hash tests
echo ---
-%PATH_TO_ODIN% run crypto %COMMON%
+%PATH_TO_ODIN% run crypto %COMMON% -out:test_crypto_hash.exe
echo ---
echo Running core:encoding tests
echo ---
-%PATH_TO_ODIN% run encoding/hxa %COMMON%
-%PATH_TO_ODIN% run encoding/json %COMMON%
-%PATH_TO_ODIN% run encoding/varint %COMMON%
+%PATH_TO_ODIN% run encoding/hxa %COMMON% -out:test_hxa.exe
+%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json.exe
+%PATH_TO_ODIN% run encoding/varint %COMMON% -out:test_varint.exe
echo ---
echo Running core:math/noise tests
echo ---
-%PATH_TO_ODIN% run math/noise %COMMON%
+%PATH_TO_ODIN% run math/noise %COMMON% -out:test_noise.exe
echo ---
echo Running core:math tests
echo ---
-%PATH_TO_ODIN% run math %COMMON%
+%PATH_TO_ODIN% run math %COMMON% -out:test_core_math.exe
echo ---
echo Running core:math/linalg/glsl tests
echo ---
-%PATH_TO_ODIN% run math/linalg/glsl %COMMON%
+%PATH_TO_ODIN% run math/linalg/glsl %COMMON% -out:test_linalg_glsl.exe
echo ---
echo Running core:path/filepath tests
echo ---
-%PATH_TO_ODIN% run path/filepath %COMMON%
+%PATH_TO_ODIN% run path/filepath %COMMON% -out:test_core_filepath.exe
echo ---
echo Running core:reflect tests
echo ---
-%PATH_TO_ODIN% run reflect %COMMON%
+%PATH_TO_ODIN% run reflect %COMMON% -out:test_core_reflect.exe \ No newline at end of file
diff --git a/tests/issues/run.bat b/tests/issues/run.bat
index a652d9694..a7078ae0f 100644
--- a/tests/issues/run.bat
+++ b/tests/issues/run.bat
@@ -1,17 +1,17 @@
@echo off
-if not exist "tests\issues\build\" mkdir tests\issues\build
+if not exist "build\" mkdir build
-set COMMON=-collection:tests=tests -out:tests\issues\build\test_issue
+set COMMON=-collection:tests=.. -out:build\test_issue.exe
@echo on
-.\odin build tests\issues\test_issue_829.odin %COMMON% -file
-tests\issues\build\test_issue
+..\..\odin build test_issue_829.odin %COMMON% -file
+build\test_issue
-.\odin build tests\issues\test_issue_1592.odin %COMMON% -file
-tests\issues\build\test_issue
+..\..\odin build test_issue_1592.odin %COMMON% -file
+build\test_issue
@echo off
-rmdir /S /Q tests\issues\build
+rmdir /S /Q build
diff --git a/tests/issues/run.sh b/tests/issues/run.sh
index 117a9a5f1..ec0804bac 100755
--- a/tests/issues/run.sh
+++ b/tests/issues/run.sh
@@ -1,18 +1,18 @@
#!/bin/bash
set -eu
-mkdir -p tests/issues/build
-
-COMMON="-collection:tests=tests -out:tests/issues/build/test_issue"
+mkdir -p build
+ODIN=../../odin
+COMMON="-collection:tests=.. -out:build/test_issue"
set -x
-./odin build tests/issues/test_issue_829.odin $COMMON -file
-tests/issues/build/test_issue
+$ODIN build test_issue_829.odin $COMMON -file
+./build/test_issue
-./odin build tests/issues/test_issue_1592.odin $COMMON -file
-tests/issues/build/test_issue
+$ODIN build test_issue_1592.odin $COMMON -file
+./build/test_issue
set +x
-rm -rf tests/issues/build
+rm -rf build
diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile
index 341067c6e..6c68d7908 100644
--- a/tests/vendor/Makefile
+++ b/tests/vendor/Makefile
@@ -10,4 +10,4 @@ endif
all: botan_test
botan_test:
- $(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check $(ODINFLAGS)
+ $(ODIN) run botan -o:speed -no-bounds-check $(ODINFLAGS) -out=vendor_botan
diff --git a/tests/vendor/build.bat b/tests/vendor/build.bat
index e70d9f1d5..d92a5eaea 100644
--- a/tests/vendor/build.bat
+++ b/tests/vendor/build.bat
@@ -5,9 +5,9 @@ set PATH_TO_ODIN==..\..\odin
echo ---
echo Running vendor:botan tests
echo ---
-%PATH_TO_ODIN% run botan %COMMON%
+%PATH_TO_ODIN% run botan %COMMON% -out:vendor_botan.exe
echo ---
echo Running vendor:glfw tests
echo ---
-%PATH_TO_ODIN% run glfw %COMMON% \ No newline at end of file
+%PATH_TO_ODIN% run glfw %COMMON% -out:vendor_glfw.exe \ No newline at end of file