From 6166ab15db6d2d10b043ea71ffb1bd52f939d5d5 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 1 Jul 2023 16:03:19 -0500 Subject: [PATCH] [ox] Make tests search in {build output}/bin dir for tests --- deps/ox/src/ox/claw/test/CMakeLists.txt | 8 +++--- deps/ox/src/ox/event/test/CMakeLists.txt | 2 +- deps/ox/src/ox/fs/test/CMakeLists.txt | 26 +++++++++--------- deps/ox/src/ox/mc/test/CMakeLists.txt | 12 ++++----- deps/ox/src/ox/model/test/CMakeLists.txt | 6 ++--- deps/ox/src/ox/oc/test/CMakeLists.txt | 8 +++--- deps/ox/src/ox/preloader/CMakeLists.txt | 2 +- deps/ox/src/ox/std/test/CMakeLists.txt | 34 ++++++++++++------------ 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/deps/ox/src/ox/claw/test/CMakeLists.txt b/deps/ox/src/ox/claw/test/CMakeLists.txt index 56c64301..c8ee6900 100644 --- a/deps/ox/src/ox/claw/test/CMakeLists.txt +++ b/deps/ox/src/ox/claw/test/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries( OxClaw ) -add_test("[ox/claw] ClawTest ClawHeaderReader" ClawTest ClawHeaderReader) -add_test("[ox/claw] ClawTest ClawHeaderReader2" ClawTest ClawHeaderReader2) -add_test("[ox/claw] ClawTest ClawWriter" ClawTest ClawWriter) -add_test("[ox/claw] ClawTest ClawReader" ClawTest ClawReader) +add_test("[ox/claw] ClawHeaderReader" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawHeaderReader) +add_test("[ox/claw] ClawHeaderReader2" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawHeaderReader2) +add_test("[ox/claw] ClawWriter" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawWriter) +add_test("[ox/claw] ClawReader" ${CMAKE_BINARY_DIR}/bin/ClawTest ClawReader) diff --git a/deps/ox/src/ox/event/test/CMakeLists.txt b/deps/ox/src/ox/event/test/CMakeLists.txt index 11f56e94..34e783b1 100644 --- a/deps/ox/src/ox/event/test/CMakeLists.txt +++ b/deps/ox/src/ox/event/test/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable( target_link_libraries(EventTest OxEvent) -add_test("[ox/event] Test 1" EventTest "test1") \ No newline at end of file +add_test("[ox/event] Test 1" ${CMAKE_BINARY_DIR}/bin/EventTest "test1") diff --git a/deps/ox/src/ox/fs/test/CMakeLists.txt b/deps/ox/src/ox/fs/test/CMakeLists.txt index 57c93aa4..7fa86c30 100644 --- a/deps/ox/src/ox/fs/test/CMakeLists.txt +++ b/deps/ox/src/ox/fs/test/CMakeLists.txt @@ -10,20 +10,20 @@ target_link_libraries( OxMetalClaw ) -add_test("[ox/fs] PtrArith::setSize" FSTests PtrArith::setSize) +add_test("[ox/fs] PtrArith::setSize" ${CMAKE_BINARY_DIR}/bin/FSTests PtrArith::setSize) -add_test("[ox/fs] PathIterator::next1" FSTests PathIterator::next1) -add_test("[ox/fs] PathIterator::next2" FSTests PathIterator::next2) -add_test("[ox/fs] PathIterator::next3" FSTests PathIterator::next3) -add_test("[ox/fs] PathIterator::next4" FSTests PathIterator::next4) -add_test("[ox/fs] PathIterator::next5" FSTests PathIterator::next5) -add_test("[ox/fs] PathIterator::hasNext" FSTests PathIterator::hasNext) +add_test("[ox/fs] PathIterator::next1" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next1) +add_test("[ox/fs] PathIterator::next2" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next2) +add_test("[ox/fs] PathIterator::next3" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next3) +add_test("[ox/fs] PathIterator::next4" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next4) +add_test("[ox/fs] PathIterator::next5" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::next5) +add_test("[ox/fs] PathIterator::hasNext" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::hasNext) -add_test("[ox/fs] PathIterator::dirPath" FSTests PathIterator::dirPath) -add_test("[ox/fs] PathIterator::fileName" FSTests PathIterator::fileName) +add_test("[ox/fs] PathIterator::dirPath" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::dirPath) +add_test("[ox/fs] PathIterator::fileName" ${CMAKE_BINARY_DIR}/bin/FSTests PathIterator::fileName) -add_test("[ox/fs] NodeBuffer::insert" FSTests "NodeBuffer::insert") -add_test("[ox/fs] FileStore::readWrite" FSTests "FileStore::readWrite") +add_test("[ox/fs] NodeBuffer::insert" ${CMAKE_BINARY_DIR}/bin/FSTests "NodeBuffer::insert") +add_test("[ox/fs] FileStore::readWrite" ${CMAKE_BINARY_DIR}/bin/FSTests "FileStore::readWrite") -add_test("[ox/fs] Directory" FSTests "Directory") -add_test("[ox/fs] FileSystem" FSTests "FileSystem") +add_test("[ox/fs] Directory" ${CMAKE_BINARY_DIR}/bin/FSTests "Directory") +add_test("[ox/fs] FileSystem" ${CMAKE_BINARY_DIR}/bin/FSTests "FileSystem") diff --git a/deps/ox/src/ox/mc/test/CMakeLists.txt b/deps/ox/src/ox/mc/test/CMakeLists.txt index a1f4d5f0..5547e05c 100644 --- a/deps/ox/src/ox/mc/test/CMakeLists.txt +++ b/deps/ox/src/ox/mc/test/CMakeLists.txt @@ -8,9 +8,9 @@ target_link_libraries( OxMetalClaw ) -add_test("[ox/mc] McTest Writer" McTest MetalClawWriter) -add_test("[ox/mc] McTest Reader" McTest MetalClawReader) -#add_test("[ox/mc] McTest MetalClawDef" McTest MetalClawDef) -add_test("[ox/mc] McTest MetalClawModelValue" McTest MetalClawModelValue) -add_test("[ox/mc] McTest encodeInteger" McTest encodeInteger) -add_test("[ox/mc] McTest decodeInteger" McTest decodeInteger) +add_test("[ox/mc] Writer" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawWriter) +add_test("[ox/mc] Reader" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawReader) +#add_test("[ox/mc] MetalClawDef" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawDef) +add_test("[ox/mc] MetalClawModelValue" ${CMAKE_BINARY_DIR}/bin/McTest MetalClawModelValue) +add_test("[ox/mc] encodeInteger" ${CMAKE_BINARY_DIR}/bin/McTest encodeInteger) +add_test("[ox/mc] decodeInteger" ${CMAKE_BINARY_DIR}/bin/McTest decodeInteger) diff --git a/deps/ox/src/ox/model/test/CMakeLists.txt b/deps/ox/src/ox/model/test/CMakeLists.txt index e74fde05..d9dc1bc2 100644 --- a/deps/ox/src/ox/model/test/CMakeLists.txt +++ b/deps/ox/src/ox/model/test/CMakeLists.txt @@ -8,6 +8,6 @@ target_link_libraries( OxModel ) -add_test("[ox/model] ModelTest ModelValue" ModelTest ModelValue) -add_test("[ox/model] ModelTest getModelTypeName" ModelTest getModelTypeName) -add_test("[ox/model] ModelTest getModelTypeVersion" ModelTest getModelTypeVersion) +add_test("[ox/model] ModelValue" ${CMAKE_BINARY_DIR}/bin/ModelTest ModelValue) +add_test("[ox/model] getModelTypeName" ${CMAKE_BINARY_DIR}/bin/ModelTest getModelTypeName) +add_test("[ox/model] getModelTypeVersion" ${CMAKE_BINARY_DIR}/bin/ModelTest getModelTypeVersion) diff --git a/deps/ox/src/ox/oc/test/CMakeLists.txt b/deps/ox/src/ox/oc/test/CMakeLists.txt index 0f435d73..71602416 100644 --- a/deps/ox/src/ox/oc/test/CMakeLists.txt +++ b/deps/ox/src/ox/oc/test/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries( OxOrganicClaw ) -add_test("[ox/oc] OcTest Writer" OcTest OrganicClawWriter) -add_test("[ox/oc] OcTest Reader" OcTest OrganicClawReader) -add_test("[ox/oc] OcTest OrganicClawModelValue" OcTest OrganicClawModelValue) -add_test("[ox/oc] OcTest OrganicClawDef" OcTest OrganicClawDef) +add_test("[ox/oc] Writer" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawWriter) +add_test("[ox/oc] Reader" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawReader) +add_test("[ox/oc] OrganicClawModelValue" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawModelValue) +add_test("[ox/oc] OrganicClawDef" ${CMAKE_BINARY_DIR}/bin/OcTest OrganicClawDef) diff --git a/deps/ox/src/ox/preloader/CMakeLists.txt b/deps/ox/src/ox/preloader/CMakeLists.txt index 133aaab3..3c98acd1 100644 --- a/deps/ox/src/ox/preloader/CMakeLists.txt +++ b/deps/ox/src/ox/preloader/CMakeLists.txt @@ -1,6 +1,6 @@ add_library( - OxPreloader STATIC + OxPreloader preloader.cpp ) diff --git a/deps/ox/src/ox/std/test/CMakeLists.txt b/deps/ox/src/ox/std/test/CMakeLists.txt index cf4e58bc..9cd63a14 100644 --- a/deps/ox/src/ox/std/test/CMakeLists.txt +++ b/deps/ox/src/ox/std/test/CMakeLists.txt @@ -7,20 +7,20 @@ add_executable( target_link_libraries(StdTest OxStd) -add_test("[ox/std] ox_memcmp ABCDEFG != HIJKLMN" StdTest "ABCDEFG != HIJKLMN") -add_test("[ox/std] ox_memcmp HIJKLMN != ABCDEFG" StdTest "HIJKLMN != ABCDEFG") -add_test("[ox/std] ox_memcmp ABCDEFG == ABCDEFG" StdTest "ABCDEFG == ABCDEFG") -add_test("[ox/std] ox_memcmp ABCDEFGHI == ABCDEFG" StdTest "ABCDEFGHI == ABCDEFG") -add_test("[ox/std] itoa" StdTest "itoa") -add_test("[ox/std] BString" StdTest "BString") -add_test("[ox/std] String" StdTest "String") -add_test("[ox/std] Vector" StdTest "Vector") -add_test("[ox/std] HashMap" StdTest "HashMap") -add_test("[ox/std] HeapMgr" StdTest malloc) -add_test("[ox/std] Serialize-Int" StdTest "Serialize-Int") -add_test("[ox/std] BufferWriter" StdTest "BufferWriter") -add_test("[ox/std] StringSplit" StdTest "StringSplit") -add_test("[ox/std] FromHex" StdTest "FromHex") -add_test("[ox/std] ToHex" StdTest "ToHex") -add_test("[ox/std] UUID" StdTest "UUID") -add_test("[ox/std] UUID::generate" StdTest "UUID::generate") +add_test("[ox/std] ox_memcmp ABCDEFG != HIJKLMN" ${CMAKE_BINARY_DIR}/bin/StdTest "ABCDEFG != HIJKLMN") +add_test("[ox/std] ox_memcmp HIJKLMN != ABCDEFG" ${CMAKE_BINARY_DIR}/bin/StdTest "HIJKLMN != ABCDEFG") +add_test("[ox/std] ox_memcmp ABCDEFG == ABCDEFG" ${CMAKE_BINARY_DIR}/bin/StdTest "ABCDEFG == ABCDEFG") +add_test("[ox/std] ox_memcmp ABCDEFGHI == ABCDEFG" ${CMAKE_BINARY_DIR}/bin/StdTest "ABCDEFGHI == ABCDEFG") +add_test("[ox/std] itoa" ${CMAKE_BINARY_DIR}/bin/StdTest "itoa") +add_test("[ox/std] BString" ${CMAKE_BINARY_DIR}/bin/StdTest "BString") +add_test("[ox/std] String" ${CMAKE_BINARY_DIR}/bin/StdTest "String") +add_test("[ox/std] Vector" ${CMAKE_BINARY_DIR}/bin/StdTest "Vector") +add_test("[ox/std] HashMap" ${CMAKE_BINARY_DIR}/bin/StdTest "HashMap") +add_test("[ox/std] HeapMgr" ${CMAKE_BINARY_DIR}/bin/StdTest malloc) +add_test("[ox/std] Serialize-Int" ${CMAKE_BINARY_DIR}/bin/StdTest "Serialize-Int") +add_test("[ox/std] BufferWriter" ${CMAKE_BINARY_DIR}/bin/StdTest "BufferWriter") +add_test("[ox/std] StringSplit" ${CMAKE_BINARY_DIR}/bin/StdTest "StringSplit") +add_test("[ox/std] FromHex" ${CMAKE_BINARY_DIR}/bin/StdTest "FromHex") +add_test("[ox/std] ToHex" ${CMAKE_BINARY_DIR}/bin/StdTest "ToHex") +add_test("[ox/std] UUID" ${CMAKE_BINARY_DIR}/bin/StdTest "UUID") +add_test("[ox/std] UUID::generate" ${CMAKE_BINARY_DIR}/bin/StdTest "UUID::generate")