diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-09-10 12:36:51 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-09-10 15:03:23 +0100 |
| commit | 943181c2efe20b705aa40d30197693e7a4c1d0ac (patch) | |
| tree | 2361d339f13b31fcefe22f72cdb49700e0c9218b /tests/CMakeLists.txt | |
| parent | 7e353b7a140dade32f1f1db6afd1721cf2c18a4a (diff) | |
| download | libgit2-943181c2efe20b705aa40d30197693e7a4c1d0ac.tar.gz | |
Revert "clar: introduce CLAR_XML option"
This reverts commit a2d73f5643814cddf90d5bf489332e14ada89ab8.
Using clar to propagate the XML settings was a mistake.
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 792e6b5ff..950250418 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -54,22 +54,8 @@ IF (MSVC_IDE) SET_SOURCE_FILES_PROPERTIES("precompiled.c" COMPILE_FLAGS "/Ycprecompiled.h") ENDIF () -IF (CLAR_XML) - IF (CLAR_XML STREQUAL "ON") - SET(XML_PATH "") - ELSE () - SET(XML_PATH "${CLAR_XML}/") - ENDIF () - - SET(TESTS_OFFLINE_XML "-r${XML_PATH}results_offline.xml") - SET(TESTS_ONLINE_XML "-r${XML_PATH}results_online.xml") - SET(TESTS_GITDAEMON_XML "-r${XML_PATH}results_gitdaemon.xml") - SET(TESTS_SSH_XML "-r${XML_PATH}results_ssh.xml") - SET(TESTS_PROXY_XML "-r${XML_PATH}results_proxy.xml") -ENDIF () - -ADD_TEST(offline "${libgit2_BINARY_DIR}/libgit2_clar" -v ${TESTS_OFFLINE_XML} -xonline) -ADD_TEST(online "${libgit2_BINARY_DIR}/libgit2_clar" -v ${TESTS_ONLINE_XML} -sonline) -ADD_TEST(gitdaemon "${libgit2_BINARY_DIR}/libgit2_clar" -v ${TESTS_GITDAEMON_XML} -sonline::push) -ADD_TEST(ssh "${libgit2_BINARY_DIR}/libgit2_clar" -v ${TESTS_SSH_XML} -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths) -ADD_TEST(proxy "${libgit2_BINARY_DIR}/libgit2_clar" -v ${TESTS_PROXY_XML} -sonline::clone::proxy_credentials_in_url -sonline::clone::proxy_credentials_request) +ADD_TEST(offline "${libgit2_BINARY_DIR}/libgit2_clar" -v -xonline) +ADD_TEST(online "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline) +ADD_TEST(gitdaemon "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push) +ADD_TEST(ssh "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths) +ADD_TEST(proxy "${libgit2_BINARY_DIR}/libgit2_clar" -v -sonline::clone::proxy_credentials_in_url -sonline::clone::proxy_credentials_request) |