diff --git a/.gitmodules b/.gitmodules index d2ac847..424f86b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "extern/gtest"] - path = extern/gtest - url = https://github.com/google/googletest +[submodule "extern/ftest"] + path = extern/ftest + url = https://github.com/nemtrif/ftest diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e63087..c766221 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,5 @@ endif() if(UTF8_TESTS) enable_testing() - add_subdirectory(extern/gtest) add_subdirectory(tests) endif() diff --git a/extern/ftest b/extern/ftest new file mode 160000 index 0000000..9c7e60c --- /dev/null +++ b/extern/ftest @@ -0,0 +1 @@ +Subproject commit 9c7e60cc1b7c76f59e2ffbbc3dad15bafc5cdac5 diff --git a/extern/gtest b/extern/gtest deleted file mode 160000 index 2fe3bd9..0000000 --- a/extern/gtest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 06e0d7e..7aacc87 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,27 +13,24 @@ add_executable(noexceptionstests ) target_link_libraries(negative PRIVATE utf8::cpp) -target_link_libraries(cpp11 PRIVATE - utf8::cpp - gtest_main - ) -target_link_libraries(apitests PRIVATE - utf8::cpp - gtest_main -) +target_link_libraries(cpp11 PRIVATE utf8::cpp) +target_link_libraries(apitests PRIVATE utf8::cpp) +target_link_libraries(noexceptionstests PRIVATE utf8::cpp) -target_link_libraries(noexceptionstests PRIVATE - utf8::cpp - gtest_main -) target_compile_options(noexceptionstests PUBLIC -fno-exceptions) -set_target_properties(negative +set_target_properties(negative apitests noexceptionstests PROPERTIES CXX_STANDARD 98 CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS NO) +set_target_properties(cpp11 + PROPERTIES + CXX_STANDARD 11 + CXX_STANDARD_REQUIRED YES + CXX_EXTENSIONS NO) + add_test(negative_test negative ${PROJECT_SOURCE_DIR}/tests/test_data/utf8_invalid.txt) add_test(cpp11_test cpp11) add_test(api_test apitests) diff --git a/tests/test_checked_api.cpp b/tests/test_checked_api.cpp index 6787da6..b57e1bc 100644 --- a/tests/test_checked_api.cpp +++ b/tests/test_checked_api.cpp @@ -1,4 +1,5 @@ -#include "gtest/gtest.h" +#define F_TEST_NO_MAIN +#include "../extern/ftest/ftest.h" #include "utf8.h" #include diff --git a/tests/test_checked_iterator.cpp b/tests/test_checked_iterator.cpp index 4c44834..3f9bfe9 100644 --- a/tests/test_checked_iterator.cpp +++ b/tests/test_checked_iterator.cpp @@ -1,4 +1,5 @@ -#include "gtest/gtest.h" +#define F_TEST_NO_MAIN +#include "../extern/ftest/ftest.h" #include "utf8.h" using namespace utf8; diff --git a/tests/test_cpp11.cpp b/tests/test_cpp11.cpp index edcff9d..ac9177b 100644 --- a/tests/test_cpp11.cpp +++ b/tests/test_cpp11.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include "../extern/ftest/ftest.h" #include "utf8.h" #include using namespace utf8; diff --git a/tests/test_unchecked_api.cpp b/tests/test_unchecked_api.cpp index e9f19ca..c400ada 100644 --- a/tests/test_unchecked_api.cpp +++ b/tests/test_unchecked_api.cpp @@ -1,4 +1,4 @@ -#include "gtest/gtest.h" +#include "../extern/ftest/ftest.h" #include "utf8/unchecked.h" #include diff --git a/tests/test_unchecked_iterator.cpp b/tests/test_unchecked_iterator.cpp index 103e8e2..68943bf 100644 --- a/tests/test_unchecked_iterator.cpp +++ b/tests/test_unchecked_iterator.cpp @@ -1,4 +1,6 @@ -#include "gtest/gtest.h" +#define F_TEST_NO_MAIN +#include "../extern/ftest/ftest.h" + #include "utf8/unchecked.h" using namespace utf8::unchecked;