summaryrefslogtreecommitdiff
path: root/run
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-05-12 17:05:44 +0200
committerCarl Hetherington <cth@carlh.net>2025-05-21 23:50:03 +0200
commit6cab56ab466e821d336998cdb6769c864214e1aa (patch)
treee28b21ed644f40545eb8de78cabf8ee63faee0fd /run
parentd84cfe7de28070ea31c9a1c0bd7872ac4be4b773 (diff)
Move tests that only need src/lib into test/lib.
Diffstat (limited to 'run')
-rwxr-xr-xrun/tests8
-rw-r--r--run/tests.bat2
2 files changed, 5 insertions, 5 deletions
diff --git a/run/tests b/run/tests
index 520d5dbaf..67b190661 100755
--- a/run/tests
+++ b/run/tests
@@ -62,8 +62,8 @@ if [ "$(uname)" == "Linux" ]; then
cp -r ../libdcp/xsd build/test
cp ../libdcp/ratings build/test
# This must be our patched openssl or tests will fail
- if [ ! -f build/test/dcpomatic2_openssl ]; then
- ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl
+ if [ ! -f build/test/lib/dcpomatic2_openssl ]; then
+ ln -s ../../../../openssl/apps/openssl build/test/lib/dcpomatic2_openssl
fi
export DCPOMATIC_TEST_TOOLS_PATH=/opt/asdcplib/bin
if [ -f /src/backports/dcp_inspect ]; then
@@ -107,7 +107,7 @@ if [ "$check" == "1" ]; then
fi
if [ "$type" == "debug" ]; then
- gdb --args build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
+ gdb --args build/test/lib/unit-tests --catch_system_errors=no --log_level=test_suite $*
elif [ "$type" == "backtrace" ]; then
gdb -batch -ex "run" -ex "thread apply all bt" -return-child-result --args build/test/unit-tests --catch_system_errors=yes $*
elif [ "$type" == "valgrind" ]; then
@@ -123,5 +123,5 @@ elif [ "$type" == "helgrind" ]; then
valgrind --tool="helgrind" build/test/unit-tests $*
else
ulimit -c unlimited
- build/test/unit-tests --catch_system_errors=no $*
+ build/test/lib/unit-tests --catch_system_errors=no $*
fi
diff --git a/run/tests.bat b/run/tests.bat
index 3eb422d7d..4ef6e8ab6 100644
--- a/run/tests.bat
+++ b/run/tests.bat
@@ -4,4 +4,4 @@ xcopy ..\libdcp\tags build\test\tags\
copy ..\libdcp\ratings build\test\
copy ..\openssl\apps\openssl.exe build\test\
copy fonts\fonts.conf.windows fonts\fonts.conf
-build\test\unit-tests.exe --log_level=test_suite %1 %2
+build\test\lib\unit-tests.exe --log_level=test_suite %1 %2