Build with CTEST_USE_XMLRPC to reenable XMLRPC support in CTest.
Also add fix-CTestTestFailedSubmit-xmlrpc.diff patch to fix a (wrongly) failing test in that case.
This commit is contained in:
parent
7e9387624b
commit
4f3be47179
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,5 +1,6 @@
|
|||||||
cmake (2.8.2-2) UNRELEASED; urgency=low
|
cmake (2.8.2-2) UNRELEASED; urgency=low
|
||||||
|
|
||||||
|
[ Kai Wasserbäch ]
|
||||||
* debian/control:
|
* debian/control:
|
||||||
- Added libarchive-dev to Build-Depends.
|
- Added libarchive-dev to Build-Depends.
|
||||||
- Don't {,B-}D on procps on Hurd, already provided by hurd.
|
- Don't {,B-}D on procps on Hurd, already provided by hurd.
|
||||||
@ -7,6 +8,11 @@ cmake (2.8.2-2) UNRELEASED; urgency=low
|
|||||||
* debian/patches/add_libarchive_script.patch: Added to allow building with
|
* debian/patches/add_libarchive_script.patch: Added to allow building with
|
||||||
the system's libarchive.
|
the system's libarchive.
|
||||||
|
|
||||||
|
[ Modestas Vainius ]
|
||||||
|
* Build with CTEST_USE_XMLRPC to reenable XMLRPC support in CTest and add
|
||||||
|
fix-CTestTestFailedSubmit-xmlrpc.diff patch to fix a (wrongly) failing test
|
||||||
|
in that case.
|
||||||
|
|
||||||
-- Kai Wasserbäch <debian@carbon-project.org> Fri, 02 Jul 2010 01:06:56 +0200
|
-- Kai Wasserbäch <debian@carbon-project.org> Fri, 02 Jul 2010 01:06:56 +0200
|
||||||
|
|
||||||
cmake (2.8.2-1) unstable; urgency=low
|
cmake (2.8.2-1) unstable; urgency=low
|
||||||
|
22
debian/patches/fix-CTestTestFailedSubmit-xmlrpc.diff
vendored
Normal file
22
debian/patches/fix-CTestTestFailedSubmit-xmlrpc.diff
vendored
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
Subject: pass the CTestTestFailedSubmit-xmlrpc test when there is "Submission problem" in the output
|
||||||
|
This is at least applicable to XMLRPC. Full error message is below:
|
||||||
|
------
|
||||||
|
Submission problem: Curl failed to perform HTTP POST request. curl_easy_perform() says: <url> malformed (-504)
|
||||||
|
.
|
||||||
|
Problems when submitting via XML-RPC
|
||||||
|
------
|
||||||
|
Author: Modestas Vainius <modax@debian.org>
|
||||||
|
Forwarded: no
|
||||||
|
Origin: vendor
|
||||||
|
Last-Update: 2010-07-02
|
||||||
|
|
||||||
|
--- a/Tests/CMakeLists.txt
|
||||||
|
+++ b/Tests/CMakeLists.txt
|
||||||
|
@@ -1413,6 +1413,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=
|
||||||
|
set(regex "${regex}|The requested URL returned error")
|
||||||
|
set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
|
||||||
|
set(regex "${regex}|Submission method .xmlrpc. not compiled into CTest")
|
||||||
|
+ set(regex "${regex}|Submission problem")
|
||||||
|
set(regex "${regex}|Submission successful)")
|
||||||
|
|
||||||
|
set(ctest_coverage_labels_args "")
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -4,3 +4,4 @@ FindJNI_fix_libarch_determination.diff
|
|||||||
cpack_installed_size.diff
|
cpack_installed_size.diff
|
||||||
FindPython_fix_#569321_and_#580503.diff
|
FindPython_fix_#569321_and_#580503.diff
|
||||||
add_libarchive_script.patch
|
add_libarchive_script.patch
|
||||||
|
fix-CTestTestFailedSubmit-xmlrpc.diff
|
||||||
|
1
debian/rules
vendored
1
debian/rules
vendored
@ -19,6 +19,7 @@ $(BUILD_FLAGS_FILE):
|
|||||||
# echo 'set(BUILD_DOCUMENTATION ON CACHE BOOL "" FORCE)' >> $@
|
# echo 'set(BUILD_DOCUMENTATION ON CACHE BOOL "" FORCE)' >> $@
|
||||||
# echo 'set(BUILD_DOXYGEN ON CACHE BOOL "" FORCE)' >> $@
|
# echo 'set(BUILD_DOXYGEN ON CACHE BOOL "" FORCE)' >> $@
|
||||||
echo 'set(CMAKE_USE_SYSTEM_LIBARCHIVE YES CACHE BOOL "" FORCE)' >> $@
|
echo 'set(CMAKE_USE_SYSTEM_LIBARCHIVE YES CACHE BOOL "" FORCE)' >> $@
|
||||||
|
echo 'set(CTEST_USE_XMLRPC YES CACHE BOOL "" FORCE)' >> $@
|
||||||
|
|
||||||
override_dh_auto_configure: $(BUILD_FLAGS_FILE)
|
override_dh_auto_configure: $(BUILD_FLAGS_FILE)
|
||||||
rm -rf Build && mkdir -p Build
|
rm -rf Build && mkdir -p Build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user