kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Zack Galbreath 2013-08-28 15:28:14 -04:00
parent b6f6802b3d
commit 5a4a5841d4
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/Contracts/Trilinos-10-6/CMakeLists.txt → Tests/Contracts/Trilinos/CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(Trilinos-10-6) project(Trilinos)
include(ExternalProject) include(ExternalProject)
@ -27,12 +27,12 @@ endif()
message(STATUS "HOME='${HOME}'") message(STATUS "HOME='${HOME}'")
if(NOT DEFINED url) 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() endif()
message(STATUS "url='${url}'") message(STATUS "url='${url}'")
if(NOT DEFINED md5) if(NOT DEFINED md5)
set(md5 "690230465dd21a76e3c6636fd07bd2f0") set(md5 "28b6a3c7c0fb317b3a237997293faa8b")
endif() endif()
message(STATUS "md5='${md5}'") message(STATUS "md5='${md5}'")

4
Tests/Contracts/Trilinos-10-6/Dashboard.cmake.in → Tests/Contracts/Trilinos/Dashboard.cmake.in
View File

@ -14,7 +14,7 @@ set(ENV{CTEST_SITE} "${CTEST_SITE}")
# Allow override of the environment on a per-client basis: # 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}") if(ENV_SCRIPT AND EXISTS "${ENV_SCRIPT}")
include("${ENV_SCRIPT}") include("${ENV_SCRIPT}")
endif() endif()
@ -49,7 +49,7 @@ endif()
# #
execute_process(COMMAND execute_process(COMMAND
"${CMAKE_CTEST_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 -VV
WORKING_DIRECTORY "${CTEST_BINARY_DIRECTORY}" WORKING_DIRECTORY "${CTEST_BINARY_DIRECTORY}"
RESULT_VARIABLE rv RESULT_VARIABLE rv

0
Tests/Contracts/Trilinos-10-6/EnvScript.cmake → Tests/Contracts/Trilinos/EnvScript.cmake
View File

0
Tests/Contracts/Trilinos-10-6/Patch.cmake → Tests/Contracts/Trilinos/Patch.cmake
View File

2
Tests/Contracts/Trilinos-10-6/RunTest.cmake → Tests/Contracts/Trilinos/RunTest.cmake
View File

@ -4,4 +4,4 @@ set(dir "${CMAKE_CURRENT_BINARY_DIR}/Contracts/${project}")
set(exe "${CMAKE_COMMAND}") set(exe "${CMAKE_COMMAND}")
set(args -P "${dir}/ValidateBuild.cmake") set(args -P "${dir}/ValidateBuild.cmake")
set(Trilinos-10-6_RUN_TEST ${exe} ${args}) set(Trilinos_RUN_TEST ${exe} ${args})

6
Tests/Contracts/Trilinos-10-6/ValidateBuild.cmake.in → Tests/Contracts/Trilinos/ValidateBuild.cmake.in
View File

@ -20,10 +20,10 @@ message(STATUS "Found len='${len}' *.exe files")
# Try to find the Teuchos unit tests executable: # 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) list(LENGTH exe len)
if(NOT len EQUAL 1) 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() endif()
message(STATUS "Found exe='${exe}'") message(STATUS "Found exe='${exe}'")
@ -31,7 +31,7 @@ message(STATUS "Found exe='${exe}'")
# Try to run it: # Try to run it:
execute_process(COMMAND ${exe} RESULT_VARIABLE rv) execute_process(COMMAND ${exe} RESULT_VARIABLE rv)
if(NOT "${rv}" STREQUAL "0") 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() endif()
message(STATUS "Ran exe='${exe}' rv='${rv}'") message(STATUS "Ran exe='${exe}' rv='${rv}'")