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 | |
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.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | ci/build.ps1 | 4 | ||||
-rwxr-xr-x | ci/build.sh | 4 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 24 |
4 files changed, 8 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a888c5a5f..d9c0a1fbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,8 +62,6 @@ OPTION(USE_EXT_HTTP_PARSER "Use system HTTP_Parser if available" ON) OPTION(DEBUG_POOL "Enable debug pool allocator" OFF) OPTION(ENABLE_WERROR "Enable compilation with -Werror" OFF) OPTION(USE_BUNDLED_ZLIB "Use the bundled version of zlib" OFF) - SET(CLAR_XML "OFF" CACHE STRING - "Writes test results in XML format. One of ON, OFF or the directory to write to; this does not affect the output executables, this only affects the behavior of the ctest command.") IF (UNIX AND NOT APPLE) OPTION(ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF) diff --git a/ci/build.ps1 b/ci/build.ps1 index c74717d10..159c1dd1b 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -18,9 +18,7 @@ Write-Host "#################################################################### Write-Host "## Configuring build environment" Write-Host "##############################################################################" -$TestOutputDirectory = $BuildDirectory -replace "\\", "/" - -Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON -DCLAR_XML=${TestOutputDirectory} ${Env:CMAKE_OPTIONS}" +Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON ${Env:CMAKE_OPTIONS}" if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) } Write-Host "" diff --git a/ci/build.sh b/ci/build.sh index b4f0a6f67..49e733077 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -28,8 +28,8 @@ echo "########################################################################## echo "## Configuring build environment" echo "##############################################################################" -echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DCLAR_XML=\"${BUILD_DIR}\" ${CMAKE_OPTIONS} -cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DCLAR_XML="${BUILD_DIR}" ${CMAKE_OPTIONS} +echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS} +cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS} echo "" echo "##############################################################################" 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) |