Commit a5a0c7699f64c6f8b1bad6fed094d63ffe3614cb
2018-10-26T13:53:40
Revert "clar: introduce CLAR_XML option" This reverts commit a2d73f5643814cddf90d5bf489332e14ada89ab8. Using clar to propagate the XML settings was a mistake. (cherry picked from commit 943181c2efe20b705aa40d30197693e7a4c1d0ac)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4cda07..2eca57d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,8 +44,6 @@ OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF )
OPTION( VALGRIND "Configure build for valgrind" OFF )
OPTION( CURL "Use curl for HTTP if available" ON)
OPTION( DEBUG_POOL "Enable debug pool allocator" 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(DEBUG_POOL)
ADD_DEFINITIONS(-DGIT_DEBUG_POOL)
@@ -706,25 +704,11 @@ IF (BUILD_CLAR)
ENABLE_TESTING()
- 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_clar -v ${TESTS_OFFLINE_XML} -xonline)
- ADD_TEST(online libgit2_clar -v ${TESTS_ONLINE_XML} -sonline)
- ADD_TEST(gitdaemon libgit2_clar -v ${TESTS_GITDAEMON_XML} -sonline::push)
- ADD_TEST(ssh libgit2_clar -v ${TESTS_SSH_XML} -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths)
- ADD_TEST(proxy libgit2_clar -v ${TESTS_PROXY_XML} -sonline::clone::proxy_credentials_in_url -sonline::clone::proxy_credentials_request)
+ ADD_TEST(offline libgit2_clar -v -xonline)
+ ADD_TEST(online libgit2_clar -v -sonline)
+ ADD_TEST(gitdaemon libgit2_clar -v -sonline::push)
+ ADD_TEST(ssh libgit2_clar -v -sonline::push -sonline::clone::ssh_cert -sonline::clone::ssh_with_paths)
+ ADD_TEST(proxy libgit2_clar -v -sonline::clone::proxy_credentials_in_url -sonline::clone::proxy_credentials_request)
ENDIF ()
IF (TAGS)
diff --git a/ci/build.ps1 b/ci/build.ps1
index c74717d..159c1dd 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 c09b319..a1deab3 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -28,8 +28,8 @@ echo "##########################################################################
echo "## Configuring build environment"
echo "##############################################################################"
-echo cmake ${SOURCE_DIR} -DBUILD_EXAMPLES=ON -DCLAR_XML=\"${BUILD_DIR}\" ${CMAKE_OPTIONS}
-cmake ${SOURCE_DIR} -DBUILD_EXAMPLES=ON -DCLAR_XML="${BUILD_DIR}" ${CMAKE_OPTIONS}
+echo cmake ${SOURCE_DIR} -DBUILD_EXAMPLES=ON ${CMAKE_OPTIONS}
+cmake ${SOURCE_DIR} -DBUILD_EXAMPLES=ON ${CMAKE_OPTIONS}
echo ""
echo "##############################################################################"