diff options
author | dec05eba <dec05eba@protonmail.com> | 2020-11-03 06:11:09 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2020-11-03 06:11:09 +0100 |
commit | 1a6c67af3851748a0a604e3b3e99bd63f3f576a0 (patch) | |
tree | cdf4c0fe3ede4c4b966941a6bb3dd0af6ca0a769 /tests | |
parent | 396598030927a8e531bd68ba3b382f86645af6c6 (diff) |
Remove ability to use git projects as dependencies. Users can add them as git submodules instead
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/confTest/confTest.cpp | 14 | ||||
-rw-r--r-- | tests/src/confTest/validProject.conf | 1 | ||||
-rw-r--r-- | tests/src/main.cpp | 2 | ||||
-rw-r--r-- | tests/src/platformTest.cpp | 2 | ||||
-rw-r--r-- | tests/src/versionTest.cpp | 2 |
5 files changed, 4 insertions, 17 deletions
diff --git a/tests/src/confTest/confTest.cpp b/tests/src/confTest/confTest.cpp index ec8a563..68e2225 100644 --- a/tests/src/confTest/confTest.cpp +++ b/tests/src/confTest/confTest.cpp @@ -1,4 +1,4 @@ -#include <catch.hpp> +#include <catch2/catch.hpp> #include "../../../include/Conf.hpp" using namespace sibs; @@ -32,18 +32,6 @@ TEST_CASE("parse config") REQUIRE(catch2Dependency->name == "catch2"); REQUIRE(catch2Dependency->version.toString() == ">=1.0.0 and <2.0.0"); - REQUIRE(sibsConfig.getGitDependencies().size() == 1); - for(auto *dep : sibsConfig.getGitDependencies()) - { - REQUIRE(dep->getSource() == Dependency::Source::GIT); - } - const Dependency *sfmlAllDependency = sibsConfig.getGitDependencies()[0]; - const GitDependency *sfmlAllDependencyGit = sfmlAllDependency->asGitDependency(); - REQUIRE(sfmlAllDependencyGit->name == "sfml-all"); - REQUIRE(sfmlAllDependencyGit->url == "https://github.com/DEC05EBA/sfml-all.git"); - REQUIRE(sfmlAllDependencyGit->branch == "master"); - REQUIRE(sfmlAllDependencyGit->revision == "HEAD"); - REQUIRE(sibsConfig.shouldUseCmake()); REQUIRE(sibsConfig.getCmakeDir() == TINYDIR_STRING("tests/src/confTest/cmakeGlobal")); diff --git a/tests/src/confTest/validProject.conf b/tests/src/confTest/validProject.conf index c5232c6..cd3f9cc 100644 --- a/tests/src/confTest/validProject.conf +++ b/tests/src/confTest/validProject.conf @@ -7,7 +7,6 @@ platforms = ["linux64", "win64"] [dependencies] xxhash = "0.1.0" # random comment at end of line catch2 = "1.0.0" -sfml-all = { git = "https://github.com/DEC05EBA/sfml-all.git", branch = "master" } # cmake building is currrently not implemented, but it is intended to work like this [cmake] diff --git a/tests/src/main.cpp b/tests/src/main.cpp index b3143fb..4ed06df 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,2 +1,2 @@ #define CATCH_CONFIG_MAIN -#include <catch.hpp> +#include <catch2/catch.hpp> diff --git a/tests/src/platformTest.cpp b/tests/src/platformTest.cpp index aecc3e4..dfa3923 100644 --- a/tests/src/platformTest.cpp +++ b/tests/src/platformTest.cpp @@ -1,4 +1,4 @@ -#include <catch.hpp> +#include <catch2/catch.hpp> #include "../../include/Platform.hpp" using namespace sibs; diff --git a/tests/src/versionTest.cpp b/tests/src/versionTest.cpp index 48a8838..307496f 100644 --- a/tests/src/versionTest.cpp +++ b/tests/src/versionTest.cpp @@ -1,4 +1,4 @@ -#include <catch.hpp> +#include <catch2/catch.hpp> #include "../../include/VersionParser.hpp" using namespace sibs; |