aboutsummaryrefslogtreecommitdiff
path: root/tests/src/confTest
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-10-10 07:59:51 +0200
committerdec05eba <dec05eba@protonmail.com>2020-07-06 07:39:33 +0200
commit7c24c5d0de4d3584d6d2f9f3c26b4d757b0a0df2 (patch)
tree81585a1be9126c4bc1be946e74b4b6e1d706279b /tests/src/confTest
parent6b238d4bc3c142f6337a73d858e069cae778dc54 (diff)
Fix sibs test not including parent library correctly
Refactor config parsing to reduce number of changes when introducing a new platform to support
Diffstat (limited to 'tests/src/confTest')
-rw-r--r--tests/src/confTest/confTest.cpp12
-rw-r--r--tests/src/confTest/linux/x86/static/debug/libcool.a0
-rw-r--r--tests/src/confTest/linux/x86/static/release/libcool.a0
3 files changed, 7 insertions, 5 deletions
diff --git a/tests/src/confTest/confTest.cpp b/tests/src/confTest/confTest.cpp
index b5d5ae1..8dab691 100644
--- a/tests/src/confTest/confTest.cpp
+++ b/tests/src/confTest/confTest.cpp
@@ -83,11 +83,13 @@ TEST_CASE("parse config - use different config for different platforms")
}
#if OS_TYPE == OS_TYPE_LINUX and defined(SIBS_ENV_64BIT)
- #ifdef DEBUG
- REQUIRE(sibsConfig.getDebugStaticLibs()[0] == TINYDIR_STRING("tests/src/confTest/linux/x64/static/debug/libcool.a"));
- #else
- REQUIRE(sibsConfig.getDebugStaticLibs()[0] == TINYDIR_STRING("tests/src/confTest/linux/x64/static/release/libcool.a"));
- #endif
+ REQUIRE(sibsConfig.getDebugStaticLibs()[0] == TINYDIR_STRING("tests/src/confTest/linux/x64/static/debug/libcool.a"));
+ REQUIRE(sibsConfig.getReleaseStaticLibs()[0] == TINYDIR_STRING("tests/src/confTest/linux/x64/static/release/libcool.a"));
+ REQUIRE(sibsConfig.getGlobalIncludeDirs()[0] == "include_linux64");
+ #elif OS_TYPE == OS_TYPE_LINUX and defined(SIBS_ENV_32BIT)
+ REQUIRE(sibsConfig.getDebugStaticLibs()[0] == TINYDIR_STRING("tests/src/confTest/linux/x86/static/debug/libcool.a"));
+ REQUIRE(sibsConfig.getReleaseStaticLibs()[0] == TINYDIR_STRING("tests/src/confTest/linux/x86/static/release/libcool.a"));
+ REQUIRE(sibsConfig.getGlobalIncludeDirs()[0] == "include_linux32");
#endif
}
diff --git a/tests/src/confTest/linux/x86/static/debug/libcool.a b/tests/src/confTest/linux/x86/static/debug/libcool.a
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/src/confTest/linux/x86/static/debug/libcool.a
diff --git a/tests/src/confTest/linux/x86/static/release/libcool.a b/tests/src/confTest/linux/x86/static/release/libcool.a
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/src/confTest/linux/x86/static/release/libcool.a