diff options
| author | dec05eba <dec05eba@protonmail.com> | 2017-12-31 05:24:40 +0100 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2017-12-31 05:26:07 +0100 |
| commit | 017ec45e94204f977dcd7b04c8035d48f230ded3 (patch) | |
| tree | 7778ecc069f05fb527329f36876ed13a17a48ab3 /tests | |
| parent | 7a5910121ab0ad2ea8a4a60e5b6599b7255e5a5e (diff) | |
Sibs can now build itself on windows
Fixed several bugs.
The windows implementation IS QUICK AND DIRTY! It links
things as static even if you wish to link as dynamic etc.....
NEED TO FIX THIS !!!
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/project.conf | 2 | ||||
| -rw-r--r-- | tests/src/confTest/confTest.cpp | 6 | ||||
| -rw-r--r-- | tests/src/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/project.conf b/tests/project.conf index 6a33314..0f33088 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -1,2 +1,2 @@ [dependencies] -catch2 = "0.1.0" +catch2 = "2.0.1"
\ No newline at end of file diff --git a/tests/src/confTest/confTest.cpp b/tests/src/confTest/confTest.cpp index eaf5c0b..e1b5b7a 100644 --- a/tests/src/confTest/confTest.cpp +++ b/tests/src/confTest/confTest.cpp @@ -1,12 +1,12 @@ -#include "catch2/0.1.0/catch.hpp" +#include "catch2/2.0.1/catch.hpp" #include "../../../include/Conf.hpp" using namespace sibs; TEST_CASE("parse config") { - SibsConfig sibsConfig(Compiler::GCC, "tests/src/confTest"); - Result<bool> result = Config::readFromFile("tests/src/confTest/project.conf", sibsConfig); + SibsConfig sibsConfig(Compiler::GCC, TINYDIR_STRING("tests/src/confTest")); + Result<bool> result = Config::readFromFile(TINYDIR_STRING("tests/src/confTest/project.conf"), sibsConfig); if(result.isErr()) { fprintf(stderr, "%s", result.getErrMsg().c_str()); diff --git a/tests/src/main.cpp b/tests/src/main.cpp index d29d915..50ecd8b 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,2 +1,2 @@ #define CATCH_CONFIG_MAIN -#include "catch2/0.1.0/catch.hpp" +#include "catch2/2.0.1/catch.hpp" |