[Cmake-commits] CMake branch, next, updated. v2.8.2-1146-g2d3d648

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2d3d648f3a61b30d45a38ceece534e41419ee492 (commit)
       via  bb1df1ec8ea880c9859845b85828b8b724abb1ba (commit)
       via  aa350314db06da703b40c0c095a6212d3bab2e68 (commit)
       via  c1a064ba79412d803830350b84fa25ebbf7130a7 (commit)
       via  e3c46e648bfc6e717f1850bcab62ded310313346 (commit)
       via  2d3952d5210546ec4a861676b12edac249dd2f18 (commit)
      from  ad781ed7d63a71e4f3e7eb35ed6e1d86314a9571 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d3d648f3a61b30d45a38ceece534e41419ee492
commit 2d3d648f3a61b30d45a38ceece534e41419ee492
Merge: ad781ed bb1df1e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 2 12:12:58 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 2 12:12:58 2010 -0400

    Merge topic 'improve-HTML-test' into next
    
    bb1df1e Make HTML test fail when --nonet arg is not available.
    aa35031 KWSys Nightly Date Stamp
    c1a064b KWSys Nightly Date Stamp
    e3c46e6 KWSys Nightly Date Stamp
    2d3952d KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb1df1ec8ea880c9859845b85828b8b724abb1ba
commit bb1df1ec8ea880c9859845b85828b8b724abb1ba
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Nov 2 10:41:11 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Nov 2 10:41:11 2010 -0400

    Make HTML test fail when --nonet arg is not available.
    
    Also, emit "xmllint" and "xmllint --version" output before
    failing so that we can inspect the output from all the
    dashboard machines in CDash test results.

diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 4c9202c..e1c8827 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -153,9 +153,33 @@ if(BUILD_TESTING)
         ${HTML_FILES}
         )
     else()
-      add_test(CMake.HTML
-        ${LIBXML2_XMLLINT_EXECUTABLE} --valid --noout ${HTML_FILES}
-        )
+      # Intentionally committing this chunk of code for one night's run on the
+      # Nightly dashboard suite. This will help us identify all machines with
+      # older versions of xmllint installed. (This should match the set of
+      # machines where this test is failing at the moment anyhow...)
+      #
+      # After we identify all of them, we can decide whether to simply make
+      # this else block empty, skipping the test, or whether there should be
+      # some alternative equivalent test on such machines...
+      #
+      set(script "${CMAKE_CURRENT_BINARY_DIR}/CMake.HTML.cmake")
+
+      set(text "Intentionally fail when xmllint has no --nonet arg.")
+      set(text "${text} The CMake test suite should avoid network activity")
+      set(text "${text} when possible.")
+
+      if(NOT EXISTS "${script}.in")
+        file(WRITE "${script}.in" "execute_process(COMMAND
+  \"${LIBXML2_XMLLINT_EXECUTABLE}\" OUTPUT_VARIABLE noargs)
+message(\"\${noargs}\")
+execute_process(COMMAND
+  \"${LIBXML2_XMLLINT_EXECUTABLE}\" --version OUTPUT_VARIABLE version)
+message(\"\${version}\")
+message(FATAL_ERROR \"${text}\")
+")
+      endif()
+      configure_file("${script}.in" "${script}" @ONLY)
+      add_test(CMake.HTML ${CMAKE_CMAKE_COMMAND} -P ${script})
     endif()
   endif()
 endif()

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |    4 ++--
 Utilities/CMakeLists.txt          |   30 +++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake