[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.116.2.7 1.116.2.8 CTestUpdateCVS.cmake.in 1.6.2.1 1.6.2.2 CTestUpdateCommon.cmake 1.6.2.1 1.6.2.2 CTestUpdateGIT.cmake.in 1.3 1.3.2.1 CTestUpdateGIT.sh.in NONE 1.1.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 11 10:50:44 EST 2010
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv14303/Tests
Modified Files:
Tag: CMake-2-8
CMakeLists.txt CTestUpdateCVS.cmake.in CTestUpdateCommon.cmake
CTestUpdateGIT.cmake.in
Added Files:
Tag: CMake-2-8
CTestUpdateGIT.sh.in
Log Message:
CMake 2.8.1-rc2
Index: CTestUpdateCVS.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCVS.cmake.in,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** CTestUpdateCVS.cmake.in 28 Jan 2010 21:48:04 -0000 1.6.2.1
--- CTestUpdateCVS.cmake.in 11 Feb 2010 15:50:42 -0000 1.6.2.2
***************
*** 7,10 ****
--- 7,11 ----
set(TOP "${TOP}/@CTestUpdateCVS_DIR@")
set(UPDATE_NOT_GLOBAL 1)
+ set(UPDATE_MAYBE Updated{CTestConfig.cmake})
# Include code common to all update tests.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.116.2.7
retrieving revision 1.116.2.8
diff -C 2 -d -r1.116.2.7 -r1.116.2.8
*** CMakeLists.txt 28 Jan 2010 21:48:04 -0000 1.116.2.7
--- CMakeLists.txt 11 Feb 2010 15:50:42 -0000 1.116.2.8
***************
*** 1287,1290 ****
--- 1287,1301 ----
CONFIGURE_FILE(
+ "${CMake_SOURCE_DIR}/Tests/CTestTestScheduler/test.cmake.in"
+ "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/test.cmake"
+ @ONLY ESCAPE_QUOTES)
+ ADD_TEST(CTestTestScheduler ${CMAKE_CTEST_COMMAND}
+ -S "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/test.cmake" -V
+ --output-log "${CMake_BINARY_DIR}/Tests/CTestTestScheduler/testOutput.log"
+ )
+ SET_TESTS_PROPERTIES(CTestTestScheduler PROPERTIES
+ PASS_REGULAR_EXPRESSION "Start 1.*Start 2.*Start 3.*Start 4.*Start 5.*Start 5.*Start 4.*Start 3.*Start 2.*Start 1")
+
+ CONFIGURE_FILE(
"${CMake_SOURCE_DIR}/Tests/CTestTestSubdir/test.cmake.in"
"${CMake_BINARY_DIR}/Tests/CTestTestSubdir/test.cmake"
Index: CTestUpdateGIT.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateGIT.cmake.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** CTestUpdateGIT.cmake.in 1 Sep 2009 19:41:43 -0000 1.3
--- CTestUpdateGIT.cmake.in 11 Feb 2010 15:50:42 -0000 1.3.2.1
***************
*** 26,29 ****
--- 26,35 ----
init_testing()
+ if(UNIX)
+ set(src "@CMAKE_CURRENT_SOURCE_DIR@")
+ configure_file(${src}/CTestUpdateGIT.sh.in ${TOP}/git.sh @ONLY)
+ set(GIT ${TOP}/git.sh)
+ endif()
+
#-----------------------------------------------------------------------------
# Create the repository.
--- NEW FILE: CTestUpdateGIT.sh.in ---
#!/bin/sh
if test "x$1" = "xpull"; then
"@GIT@" "$@" && sleep 1 && touch foo.txt
else
exec "@GIT@" "$@"
fi
Index: CTestUpdateCommon.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestUpdateCommon.cmake,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C 2 -d -r1.6.2.1 -r1.6.2.2
*** CTestUpdateCommon.cmake 28 Jan 2010 21:48:04 -0000 1.6.2.1
--- CTestUpdateCommon.cmake 11 Feb 2010 15:50:42 -0000 1.6.2.2
***************
*** 31,48 ****
# Read entries from the Update.xml file
file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_ENTRIES
! REGEX "FullName"
LIMIT_INPUT 4096
)
! # Verify that expected entries exist
! set(MISSING)
! foreach(f ${ARGN})
! string(REPLACE "/" "[/\\\\]" regex "${f}")
! string(REPLACE "." "\\." regex "${regex}")
! if(NOT "${UPDATE_XML_ENTRIES}" MATCHES "<FullName>${regex}</FullName>")
! list(APPEND MISSING ${f})
! endif()
! endforeach(f)
if(NOT UPDATE_NOT_GLOBAL)
--- 31,48 ----
# Read entries from the Update.xml file
+ set(types "Updated|Modified|Conflicting")
file(STRINGS ${TOP}/${UPDATE_XML_FILE} UPDATE_XML_ENTRIES
! REGEX "<(${types}|FullName)>"
LIMIT_INPUT 4096
)
+ string(REGEX REPLACE
+ "[ \t]*<(${types})>[ \t]*;[ \t]*<FullName>([^<]*)</FullName>"
+ "\\1{\\2}" UPDATE_XML_ENTRIES "${UPDATE_XML_ENTRIES}")
! # Compare expected and actual entries
! set(EXTRA "${UPDATE_XML_ENTRIES}")
! list(REMOVE_ITEM EXTRA ${ARGN} ${UPDATE_MAYBE})
! set(MISSING "${ARGN}")
! list(REMOVE_ITEM MISSING ${UPDATE_XML_ENTRIES})
if(NOT UPDATE_NOT_GLOBAL)
***************
*** 66,76 ****
# Report the result
if(MISSING)
# List the missing entries
! set(MSG "Update.xml is missing an entry for:\n")
foreach(f ${MISSING})
set(MSG "${MSG} ${f}\n")
endforeach(f)
# Provide the log file
file(GLOB UPDATE_LOG_FILE
--- 66,94 ----
# Report the result
+ set(MSG "")
if(MISSING)
# List the missing entries
! set(MSG "${MSG}Update.xml is missing expected entries:\n")
foreach(f ${MISSING})
set(MSG "${MSG} ${f}\n")
endforeach(f)
+ else(MISSING)
+ # Success
+ message(" no entries missing from Update.xml")
+ endif(MISSING)
+
+ # Report the result
+ if(EXTRA)
+ # List the extra entries
+ set(MSG "${MSG}Update.xml has extra unexpected entries:\n")
+ foreach(f ${EXTRA})
+ set(MSG "${MSG} ${f}\n")
+ endforeach(f)
+ else(EXTRA)
+ # Success
+ message(" no extra entries in Update.xml")
+ endif(EXTRA)
+ if(MSG)
# Provide the log file
file(GLOB UPDATE_LOG_FILE
***************
*** 86,93 ****
# Display the error message
message(FATAL_ERROR "${MSG}")
! else(MISSING)
! # Success
! message(" no entries missing from Update.xml")
! endif(MISSING)
endfunction(check_updates)
--- 104,108 ----
# Display the error message
message(FATAL_ERROR "${MSG}")
! endif(MSG)
endfunction(check_updates)
***************
*** 176,181 ****
# Verify the updates reported by CTest.
! check_updates(${bin_dir} foo.txt bar.txt zot.txt CTestConfig.cmake
! subdir/foo.txt subdir/bar.txt)
endfunction(run_dashboard_command_line)
--- 191,203 ----
# Verify the updates reported by CTest.
! list(APPEND UPDATE_MAYBE Updated{subdir})
! check_updates(${bin_dir}
! Updated{foo.txt}
! Updated{bar.txt}
! Updated{zot.txt}
! Updated{subdir/foo.txt}
! Updated{subdir/bar.txt}
! Modified{CTestConfig.cmake}
! )
endfunction(run_dashboard_command_line)
***************
*** 189,194 ****
# Verify the updates reported by CTest.
! check_updates(dash-binary foo.txt bar.txt zot.txt
! subdir/foo.txt subdir/bar.txt)
endfunction(run_dashboard_script)
--- 211,222 ----
# Verify the updates reported by CTest.
! list(APPEND UPDATE_MAYBE Updated{subdir})
! check_updates(dash-binary
! Updated{foo.txt}
! Updated{bar.txt}
! Updated{zot.txt}
! Updated{subdir/foo.txt}
! Updated{subdir/bar.txt}
! )
endfunction(run_dashboard_script)
More information about the Cmake-commits
mailing list