[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.19 1.20 CMakeMinimumRequiredTest.cmake.in NONE 1.1 CMakeMinimumRequiredTestScript.cmake NONE 1.1 MathTest.cmake.in NONE 1.1 MathTestScript.cmake NONE 1.1

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Added Files:
	CMakeMinimumRequiredTest.cmake.in 
	CMakeMinimumRequiredTestScript.cmake MathTest.cmake.in 
	MathTestScript.cmake 
Log Message:
Add tests for uncovered bits of the math and cmake_minimum_required cmake functions.


--- NEW FILE: MathTestScript.cmake ---
message(STATUS "testname='${testname}'")

if(testname STREQUAL empty) # fail
  math()

elseif(testname STREQUAL bogus) # fail
  math(BOGUS)

elseif(testname STREQUAL not_enough_args) # fail
  math(EXPR x)

elseif(testname STREQUAL cannot_parse) # fail
  math(EXPR x "1 + 2 +")

else() # fail
  message(FATAL_ERROR "testname='${testname}' - error: no such test in '${CMAKE_CURRENT_LIST_FILE}'")

endif()

--- NEW FILE: CMakeMinimumRequiredTestScript.cmake ---
message(STATUS "testname='${testname}'")

if(testname STREQUAL empty) # pass
  cmake_minimum_required()

elseif(testname STREQUAL bogus) # fail
  cmake_minimum_required(BOGUS)

elseif(testname STREQUAL no_version) # fail
  cmake_minimum_required(VERSION)

elseif(testname STREQUAL no_version_before_fatal_error) # fail
  cmake_minimum_required(VERSION FATAL_ERROR)

elseif(testname STREQUAL bad_version) # fail
  cmake_minimum_required(VERSION 2.blah.blah)

elseif(testname STREQUAL worse_version) # fail
  cmake_minimum_required(VERSION blah.blah.blah)

elseif(testname STREQUAL future_version) # fail
  math(EXPR major "${CMAKE_MAJOR_VERSION} + 1")
  cmake_minimum_required(VERSION ${major}.2.1)

elseif(testname STREQUAL unknown_arg) # fail
  cmake_minimum_required(VERSION ${CMAKE_MAJOR_VERSION}.0.0 SILLY)

else() # fail
  message(FATAL_ERROR "testname='${testname}' - error: no such test in '${CMAKE_CURRENT_LIST_FILE}'")

endif()

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/CMakeLists.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** CMakeLists.txt	2 Oct 2009 18:51:43 -0000	1.19
--- CMakeLists.txt	5 Oct 2009 20:50:21 -0000	1.20
***************
*** 24,27 ****
--- 24,29 ----
  AddCMakeTest(ModuleNotices "")
  AddCMakeTest(String "")
+ AddCMakeTest(Math "")
+ AddCMakeTest(CMakeMinimumRequired "")
  
  SET(GetPrerequisites_PreArgs

--- NEW FILE: MathTest.cmake.in ---
# Execute each test listed in:
#
set(scriptname "@CMAKE_CURRENT_SOURCE_DIR@/MathTestScript.cmake")
set(number_of_tests_expected 4)

include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake")
execute_all_script_tests(${scriptname} number_of_tests_executed)

# And verify that number_of_tests_executed is at least as many as we know
# about as of this writing...
#
message(STATUS "scriptname='${scriptname}'")
message(STATUS "number_of_tests_executed='${number_of_tests_executed}'")
message(STATUS "number_of_tests_expected='${number_of_tests_expected}'")

if(number_of_tests_executed LESS number_of_tests_expected)
  message(FATAL_ERROR "error: some test cases were skipped")
endif()

--- NEW FILE: CMakeMinimumRequiredTest.cmake.in ---
# Execute each test listed in:
#
set(scriptname "@CMAKE_CURRENT_SOURCE_DIR@/CMakeMinimumRequiredTestScript.cmake")
set(number_of_tests_expected 8)

include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake")
execute_all_script_tests(${scriptname} number_of_tests_executed)

# And verify that number_of_tests_executed is at least as many as we know
# about as of this writing...
#
message(STATUS "scriptname='${scriptname}'")
message(STATUS "number_of_tests_executed='${number_of_tests_executed}'")
message(STATUS "number_of_tests_expected='${number_of_tests_expected}'")

if(number_of_tests_executed LESS number_of_tests_expected)
  message(FATAL_ERROR "error: some test cases were skipped")
endif()