From 5a4a5841d4b003ee3e8e62a4c1114235582cb5c4 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Wed, 28 Aug 2013 15:28:14 -0400 Subject: [PATCH] update Trilinos contract test The old version encountered a compile error on newer versions of GCC. Update to the latest supported release of Trilinos, remove the version number from the name of the Contract, and some other minor tweaks to get the test passing once more. --- Tests/Contracts/{Trilinos-10-6 => Trilinos}/CMakeLists.txt | 6 +++--- .../{Trilinos-10-6 => Trilinos}/Dashboard.cmake.in | 4 ++-- Tests/Contracts/{Trilinos-10-6 => Trilinos}/EnvScript.cmake | 0 Tests/Contracts/{Trilinos-10-6 => Trilinos}/Patch.cmake | 0 Tests/Contracts/{Trilinos-10-6 => Trilinos}/RunTest.cmake | 2 +- .../{Trilinos-10-6 => Trilinos}/ValidateBuild.cmake.in | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) rename Tests/Contracts/{Trilinos-10-6 => Trilinos}/CMakeLists.txt (95%) rename Tests/Contracts/{Trilinos-10-6 => Trilinos}/Dashboard.cmake.in (92%) rename Tests/Contracts/{Trilinos-10-6 => Trilinos}/EnvScript.cmake (100%) rename Tests/Contracts/{Trilinos-10-6 => Trilinos}/Patch.cmake (100%) rename Tests/Contracts/{Trilinos-10-6 => Trilinos}/RunTest.cmake (83%) rename Tests/Contracts/{Trilinos-10-6 => Trilinos}/ValidateBuild.cmake.in (85%) diff --git a/Tests/Contracts/Trilinos-10-6/CMakeLists.txt b/Tests/Contracts/Trilinos/CMakeLists.txt similarity index 95% rename from Tests/Contracts/Trilinos-10-6/CMakeLists.txt rename to Tests/Contracts/Trilinos/CMakeLists.txt index 79ed669a2..f5757b578 100644 --- a/Tests/Contracts/Trilinos-10-6/CMakeLists.txt +++ b/Tests/Contracts/Trilinos/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8) -project(Trilinos-10-6) +project(Trilinos) include(ExternalProject) @@ -27,12 +27,12 @@ endif() message(STATUS "HOME='${HOME}'") if(NOT DEFINED url) - set(url "http://www.cmake.org/files/contracts/trilinos-10.6.1.tar.gz") + set(url "http://www.cmake.org/files/contracts/trilinos-11.4.1.tar.gz") endif() message(STATUS "url='${url}'") if(NOT DEFINED md5) - set(md5 "690230465dd21a76e3c6636fd07bd2f0") + set(md5 "28b6a3c7c0fb317b3a237997293faa8b") endif() message(STATUS "md5='${md5}'") diff --git a/Tests/Contracts/Trilinos-10-6/Dashboard.cmake.in b/Tests/Contracts/Trilinos/Dashboard.cmake.in similarity index 92% rename from Tests/Contracts/Trilinos-10-6/Dashboard.cmake.in rename to Tests/Contracts/Trilinos/Dashboard.cmake.in index cc2950232..93d4f61ac 100644 --- a/Tests/Contracts/Trilinos-10-6/Dashboard.cmake.in +++ b/Tests/Contracts/Trilinos/Dashboard.cmake.in @@ -14,7 +14,7 @@ set(ENV{CTEST_SITE} "${CTEST_SITE}") # Allow override of the environment on a per-client basis: # -set(ENV_SCRIPT "$ENV{CMAKE_CONTRACT_Trilinos_10_6_ENV_SCRIPT}") +set(ENV_SCRIPT "$ENV{CMAKE_CONTRACT_Trilinos_ENV_SCRIPT}") if(ENV_SCRIPT AND EXISTS "${ENV_SCRIPT}") include("${ENV_SCRIPT}") endif() @@ -49,7 +49,7 @@ endif() # execute_process(COMMAND "${CMAKE_CTEST_COMMAND}" - -S "${CTEST_SOURCE_DIRECTORY}/cmake/ctest/experimental_build_test.cmake" + -S "${CTEST_SOURCE_DIRECTORY}/cmake/tribits/ctest/experimental_build_test.cmake" -VV WORKING_DIRECTORY "${CTEST_BINARY_DIRECTORY}" RESULT_VARIABLE rv diff --git a/Tests/Contracts/Trilinos-10-6/EnvScript.cmake b/Tests/Contracts/Trilinos/EnvScript.cmake similarity index 100% rename from Tests/Contracts/Trilinos-10-6/EnvScript.cmake rename to Tests/Contracts/Trilinos/EnvScript.cmake diff --git a/Tests/Contracts/Trilinos-10-6/Patch.cmake b/Tests/Contracts/Trilinos/Patch.cmake similarity index 100% rename from Tests/Contracts/Trilinos-10-6/Patch.cmake rename to Tests/Contracts/Trilinos/Patch.cmake diff --git a/Tests/Contracts/Trilinos-10-6/RunTest.cmake b/Tests/Contracts/Trilinos/RunTest.cmake similarity index 83% rename from Tests/Contracts/Trilinos-10-6/RunTest.cmake rename to Tests/Contracts/Trilinos/RunTest.cmake index 30124d8e9..d661a4c1f 100644 --- a/Tests/Contracts/Trilinos-10-6/RunTest.cmake +++ b/Tests/Contracts/Trilinos/RunTest.cmake @@ -4,4 +4,4 @@ set(dir "${CMAKE_CURRENT_BINARY_DIR}/Contracts/${project}") set(exe "${CMAKE_COMMAND}") set(args -P "${dir}/ValidateBuild.cmake") -set(Trilinos-10-6_RUN_TEST ${exe} ${args}) +set(Trilinos_RUN_TEST ${exe} ${args}) diff --git a/Tests/Contracts/Trilinos-10-6/ValidateBuild.cmake.in b/Tests/Contracts/Trilinos/ValidateBuild.cmake.in similarity index 85% rename from Tests/Contracts/Trilinos-10-6/ValidateBuild.cmake.in rename to Tests/Contracts/Trilinos/ValidateBuild.cmake.in index 04bbf214e..fa38ada54 100644 --- a/Tests/Contracts/Trilinos-10-6/ValidateBuild.cmake.in +++ b/Tests/Contracts/Trilinos/ValidateBuild.cmake.in @@ -20,10 +20,10 @@ message(STATUS "Found len='${len}' *.exe files") # Try to find the Teuchos unit tests executable: # -file(GLOB_RECURSE exe "${binary_dir}/Teuchos_UnitTest_UnitTests.exe") +file(GLOB_RECURSE exe "${binary_dir}/TeuchosCore_UnitTest_UnitTests.exe") list(LENGTH exe len) if(NOT len EQUAL 1) - message(FATAL_ERROR "len='${len}' is not the expected='1' (count of Teuchos_UnitTest_UnitTests.exe)") + message(FATAL_ERROR "len='${len}' is not the expected='1' (count of TeuchosCore_UnitTest_UnitTests.exe)") endif() message(STATUS "Found exe='${exe}'") @@ -31,7 +31,7 @@ message(STATUS "Found exe='${exe}'") # Try to run it: execute_process(COMMAND ${exe} RESULT_VARIABLE rv) if(NOT "${rv}" STREQUAL "0") - message(FATAL_ERROR "rv='${rv}' is not the expected='0' (result of running Teuchos_UnitTest_UnitTests.exe)") + message(FATAL_ERROR "rv='${rv}' is not the expected='0' (result of running TeuchosCore_UnitTest_UnitTests.exe)") endif() message(STATUS "Ran exe='${exe}' rv='${rv}'")