[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.86 1.87

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv4370/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Parse more bzr xml output encodings

The BZR xml output plugin can use some encodings that are not recognized
by expat, which leads to "Error parsing bzr log xml: unknown encoding".
This works around the problem by giving expat a mapping, and adds a
test.  Patch from Tom Vercauteren.  See issue #6857.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.86
retrieving revision 1.87
diff -C 2 -d -r1.86 -r1.87
*** CMakeLists.txt	14 May 2009 20:13:52 -0000	1.86
--- CMakeLists.txt	18 May 2009 14:34:35 -0000	1.87
***************
*** 940,943 ****
--- 940,947 ----
            -P "${CMake_BINARY_DIR}/Tests/CTestUpdateBZR.cmake"
            )
+         ADD_TEST(CTest.UpdateBZR.CLocale ${CMAKE_CMAKE_COMMAND}
+           -P "${CMake_BINARY_DIR}/Tests/CTestUpdateBZR.cmake"
+           )
+         SET_TESTS_PROPERTIES(CTest.UpdateBZR.CLocale PROPERTIES ENVIRONMENT LC_ALL=C)
          LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateBZR_DIR}")
        ENDIF( NOT ${xmlplugres} )