From e808cbb1dd9bf594e2f2c8ea2c0b82b9a6590d29 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Thu, 29 Jul 2021 18:12:03 +0300 Subject: Testing: Convert `cmake_host_system_information` tests into `RunCMake` --- .../CMakeHostSystemInformation-BadArg1.cmake | 1 - .../CMakeHostSystemInformation-BadArg2.cmake | 1 - .../CMakeHostSystemInformation-BadArg3.cmake | 1 - .../CMakeHostSystemInformation-QueryList.cmake | 5 --- .../CMakeHostSystemInformationTest.cmake.in | 52 ---------------------- Tests/CMakeTests/CMakeLists.txt | 1 - Tests/RunCMake/CMakeLists.txt | 1 + .../BadArg1-result.txt | 1 + .../BadArg1-stderr.txt | 4 ++ .../cmake_host_system_information/BadArg1.cmake | 1 + .../BadArg2-result.txt | 1 + .../BadArg2-stderr.txt | 4 ++ .../cmake_host_system_information/BadArg2.cmake | 1 + .../BadArg3-result.txt | 1 + .../BadArg3-stderr.txt | 4 ++ .../cmake_host_system_information/BadArg3.cmake | 1 + .../cmake_host_system_information/CMakeLists.txt | 7 +++ .../QueryKeys-stdout.txt | 27 +++++++++++ .../cmake_host_system_information/QueryKeys.cmake | 32 +++++++++++++ .../QueryList-stdout.txt | 1 + .../cmake_host_system_information/QueryList.cmake | 5 +++ .../RunCMakeTest.cmake | 8 ++++ 22 files changed, 99 insertions(+), 61 deletions(-) delete mode 100644 Tests/CMakeTests/CMakeHostSystemInformation-BadArg1.cmake delete mode 100644 Tests/CMakeTests/CMakeHostSystemInformation-BadArg2.cmake delete mode 100644 Tests/CMakeTests/CMakeHostSystemInformation-BadArg3.cmake delete mode 100644 Tests/CMakeTests/CMakeHostSystemInformation-QueryList.cmake delete mode 100644 Tests/CMakeTests/CMakeHostSystemInformationTest.cmake.in create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg1-result.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg1-stderr.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg1.cmake create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg2-result.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg2-stderr.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg2.cmake create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg3-result.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg3-stderr.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/BadArg3.cmake create mode 100644 Tests/RunCMake/cmake_host_system_information/CMakeLists.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/QueryKeys-stdout.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/QueryKeys.cmake create mode 100644 Tests/RunCMake/cmake_host_system_information/QueryList-stdout.txt create mode 100644 Tests/RunCMake/cmake_host_system_information/QueryList.cmake create mode 100644 Tests/RunCMake/cmake_host_system_information/RunCMakeTest.cmake diff --git a/Tests/CMakeTests/CMakeHostSystemInformation-BadArg1.cmake b/Tests/CMakeTests/CMakeHostSystemInformation-BadArg1.cmake deleted file mode 100644 index 1655eb4..0000000 --- a/Tests/CMakeTests/CMakeHostSystemInformation-BadArg1.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_host_system_information(HOSTNAME) diff --git a/Tests/CMakeTests/CMakeHostSystemInformation-BadArg2.cmake b/Tests/CMakeTests/CMakeHostSystemInformation-BadArg2.cmake deleted file mode 100644 index 1f056d5..0000000 --- a/Tests/CMakeTests/CMakeHostSystemInformation-BadArg2.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_host_system_information(RESULT FQDN HOSTNAME) diff --git a/Tests/CMakeTests/CMakeHostSystemInformation-BadArg3.cmake b/Tests/CMakeTests/CMakeHostSystemInformation-BadArg3.cmake deleted file mode 100644 index 9c5a558..0000000 --- a/Tests/CMakeTests/CMakeHostSystemInformation-BadArg3.cmake +++ /dev/null @@ -1 +0,0 @@ -cmake_host_system_information(RESULT RESULT QUERY FOOBAR) diff --git a/Tests/CMakeTests/CMakeHostSystemInformation-QueryList.cmake b/Tests/CMakeTests/CMakeHostSystemInformation-QueryList.cmake deleted file mode 100644 index 1c3156d..0000000 --- a/Tests/CMakeTests/CMakeHostSystemInformation-QueryList.cmake +++ /dev/null @@ -1,5 +0,0 @@ -cmake_host_system_information(RESULT RESULT - QUERY NUMBER_OF_LOGICAL_CORES NUMBER_OF_PHYSICAL_CORES -) - -message("[${RESULT}]") diff --git a/Tests/CMakeTests/CMakeHostSystemInformationTest.cmake.in b/Tests/CMakeTests/CMakeHostSystemInformationTest.cmake.in deleted file mode 100644 index a3c2b05..0000000 --- a/Tests/CMakeTests/CMakeHostSystemInformationTest.cmake.in +++ /dev/null @@ -1,52 +0,0 @@ -set(BadArg1-RESULT 1) -set(BadArg1-STDERR "missing RESULT specification") -set(BadArg2-RESULT 1) -set(BadArg2-STDERR "missing QUERY specification") -set(BadArg3-RESULT 1) -set(BadArg3-STDERR "does not recognize FOOBAR") -set(QueryList-RESULT 0) -set(QueryList-STDERR "\\[[0-9]+;[0-9]+\\]") - -function(try_and_print key) - cmake_host_system_information(RESULT RESULT QUERY ${key}) - message(STATUS "[${key}] [${RESULT}]") -endfunction() - -message("CTEST_FULL_OUTPUT (Avoid ctest truncation of output)") - -try_and_print(NUMBER_OF_LOGICAL_CORES) -try_and_print(NUMBER_OF_PHYSICAL_CORES) -try_and_print(HOSTNAME) -try_and_print(FQDN) -try_and_print(TOTAL_VIRTUAL_MEMORY) -try_and_print(AVAILABLE_VIRTUAL_MEMORY) -try_and_print(TOTAL_PHYSICAL_MEMORY) -try_and_print(AVAILABLE_PHYSICAL_MEMORY) -try_and_print(IS_64BIT) -try_and_print(HAS_FPU) -try_and_print(HAS_MMX) -try_and_print(HAS_MMX_PLUS) -try_and_print(HAS_SSE) -try_and_print(HAS_SSE2) -try_and_print(HAS_SSE_FP) -try_and_print(HAS_SSE_MMX) -try_and_print(HAS_AMD_3DNOW) -try_and_print(HAS_AMD_3DNOW_PLUS) -try_and_print(HAS_IA64) -try_and_print(HAS_SERIAL_NUMBER) -try_and_print(PROCESSOR_SERIAL_NUMBER) -try_and_print(PROCESSOR_NAME) -try_and_print(PROCESSOR_DESCRIPTION) -try_and_print(OS_NAME) -try_and_print(OS_RELEASE) -try_and_print(OS_VERSION) -try_and_print(OS_PLATFORM) - -include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") - -check_cmake_test(CMakeHostSystemInformation - BadArg1 - BadArg2 - BadArg3 - QueryList -) diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt index 52959e6..9e0b891 100644 --- a/Tests/CMakeTests/CMakeLists.txt +++ b/Tests/CMakeTests/CMakeLists.txt @@ -31,7 +31,6 @@ AddCMakeTest(CompilerIdVendor "") AddCMakeTest(ProcessorCount "-DKWSYS_TEST_EXE=$") AddCMakeTest(PushCheckState "") AddCMakeTest(While "") -AddCMakeTest(CMakeHostSystemInformation "") AddCMakeTest(FileDownload "") set_tests_properties(CMake.FileDownload PROPERTIES diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index ef797f7..eb2c2d9 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -349,6 +349,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) endif() add_RunCMake_test(execute_process) add_RunCMake_test(export) +add_RunCMake_test(cmake_host_system_information) add_RunCMake_test(cmake_language) add_RunCMake_test(cmake_minimum_required) add_RunCMake_test(cmake_parse_arguments) diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg1-result.txt b/Tests/RunCMake/cmake_host_system_information/BadArg1-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg1-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg1-stderr.txt b/Tests/RunCMake/cmake_host_system_information/BadArg1-stderr.txt new file mode 100644 index 0000000..ed995e6 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg1-stderr.txt @@ -0,0 +1,4 @@ +CMake Error at BadArg1\.cmake:1 \(cmake_host_system_information\): + cmake_host_system_information missing RESULT specification. +Call Stack \(most recent call first\): + CMakeLists\.txt:7 \(include\) diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg1.cmake b/Tests/RunCMake/cmake_host_system_information/BadArg1.cmake new file mode 100644 index 0000000..1655eb4 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg1.cmake @@ -0,0 +1 @@ +cmake_host_system_information(HOSTNAME) diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg2-result.txt b/Tests/RunCMake/cmake_host_system_information/BadArg2-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg2-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg2-stderr.txt b/Tests/RunCMake/cmake_host_system_information/BadArg2-stderr.txt new file mode 100644 index 0000000..b78c927 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg2-stderr.txt @@ -0,0 +1,4 @@ +CMake Error at BadArg2\.cmake:1 \(cmake_host_system_information\): + cmake_host_system_information missing QUERY specification +Call Stack \(most recent call first\): + CMakeLists\.txt:7 \(include\) diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg2.cmake b/Tests/RunCMake/cmake_host_system_information/BadArg2.cmake new file mode 100644 index 0000000..1f056d5 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg2.cmake @@ -0,0 +1 @@ +cmake_host_system_information(RESULT FQDN HOSTNAME) diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg3-result.txt b/Tests/RunCMake/cmake_host_system_information/BadArg3-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg3-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg3-stderr.txt b/Tests/RunCMake/cmake_host_system_information/BadArg3-stderr.txt new file mode 100644 index 0000000..c3f1314 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg3-stderr.txt @@ -0,0 +1,4 @@ +CMake Error at BadArg3\.cmake:1 \(cmake_host_system_information\): + cmake_host_system_information does not recognize FOOBAR +Call Stack \(most recent call first\): + CMakeLists\.txt:7 \(include\) diff --git a/Tests/RunCMake/cmake_host_system_information/BadArg3.cmake b/Tests/RunCMake/cmake_host_system_information/BadArg3.cmake new file mode 100644 index 0000000..9c5a558 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/BadArg3.cmake @@ -0,0 +1 @@ +cmake_host_system_information(RESULT RESULT QUERY FOOBAR) diff --git a/Tests/RunCMake/cmake_host_system_information/CMakeLists.txt b/Tests/RunCMake/cmake_host_system_information/CMakeLists.txt new file mode 100644 index 0000000..0198f9b --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.21) + +project(${RunCMake_TEST} NONE) + +set(CMAKE_SYSROOT ${PROJECT_SOURCE_DIR}/${RunCMake_TEST}) + +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/cmake_host_system_information/QueryKeys-stdout.txt b/Tests/RunCMake/cmake_host_system_information/QueryKeys-stdout.txt new file mode 100644 index 0000000..f583deb --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/QueryKeys-stdout.txt @@ -0,0 +1,27 @@ +-- NUMBER_OF_LOGICAL_CORES=`[0-9]+` +-- NUMBER_OF_PHYSICAL_CORES=`[0-9]+` +-- HOSTNAME=`.*` +-- FQDN=`.*` +-- TOTAL_VIRTUAL_MEMORY=`[0-9]+` +-- AVAILABLE_VIRTUAL_MEMORY=`[0-9]+` +-- TOTAL_PHYSICAL_MEMORY=`[0-9]+` +-- AVAILABLE_PHYSICAL_MEMORY=`[0-9]+` +-- IS_64BIT=`[01]` +-- HAS_FPU=`[01]` +-- HAS_MMX=`[01]` +-- HAS_MMX_PLUS=`[01]` +-- HAS_SSE=`[01]` +-- HAS_SSE2=`[01]` +-- HAS_SSE_FP=`[01]` +-- HAS_SSE_MMX=`[01]` +-- HAS_AMD_3DNOW=`[01]` +-- HAS_AMD_3DNOW_PLUS=`[01]` +-- HAS_IA64=`[01]` +-- HAS_SERIAL_NUMBER=`[01]` +-- PROCESSOR_SERIAL_NUMBER=`.*` +-- PROCESSOR_NAME=`.*` +-- PROCESSOR_DESCRIPTION=`.*` +-- OS_NAME=`.*` +-- OS_RELEASE=`.*` +-- OS_VERSION=`.*` +-- OS_PLATFORM=`.*` diff --git a/Tests/RunCMake/cmake_host_system_information/QueryKeys.cmake b/Tests/RunCMake/cmake_host_system_information/QueryKeys.cmake new file mode 100644 index 0000000..f22a0ae --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/QueryKeys.cmake @@ -0,0 +1,32 @@ +function(try_and_print key) + cmake_host_system_information(RESULT RESULT QUERY ${key}) + message(STATUS "${key}=`${RESULT}`") +endfunction() + +try_and_print(NUMBER_OF_LOGICAL_CORES) +try_and_print(NUMBER_OF_PHYSICAL_CORES) +try_and_print(HOSTNAME) +try_and_print(FQDN) +try_and_print(TOTAL_VIRTUAL_MEMORY) +try_and_print(AVAILABLE_VIRTUAL_MEMORY) +try_and_print(TOTAL_PHYSICAL_MEMORY) +try_and_print(AVAILABLE_PHYSICAL_MEMORY) +try_and_print(IS_64BIT) +try_and_print(HAS_FPU) +try_and_print(HAS_MMX) +try_and_print(HAS_MMX_PLUS) +try_and_print(HAS_SSE) +try_and_print(HAS_SSE2) +try_and_print(HAS_SSE_FP) +try_and_print(HAS_SSE_MMX) +try_and_print(HAS_AMD_3DNOW) +try_and_print(HAS_AMD_3DNOW_PLUS) +try_and_print(HAS_IA64) +try_and_print(HAS_SERIAL_NUMBER) +try_and_print(PROCESSOR_SERIAL_NUMBER) +try_and_print(PROCESSOR_NAME) +try_and_print(PROCESSOR_DESCRIPTION) +try_and_print(OS_NAME) +try_and_print(OS_RELEASE) +try_and_print(OS_VERSION) +try_and_print(OS_PLATFORM) diff --git a/Tests/RunCMake/cmake_host_system_information/QueryList-stdout.txt b/Tests/RunCMake/cmake_host_system_information/QueryList-stdout.txt new file mode 100644 index 0000000..eebe0d4 --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/QueryList-stdout.txt @@ -0,0 +1 @@ +-- \[[0-9]+;[0-9]+\] diff --git a/Tests/RunCMake/cmake_host_system_information/QueryList.cmake b/Tests/RunCMake/cmake_host_system_information/QueryList.cmake new file mode 100644 index 0000000..f24aa2b --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/QueryList.cmake @@ -0,0 +1,5 @@ +cmake_host_system_information(RESULT RESULT + QUERY NUMBER_OF_LOGICAL_CORES NUMBER_OF_PHYSICAL_CORES +) + +message(STATUS "[${RESULT}]") diff --git a/Tests/RunCMake/cmake_host_system_information/RunCMakeTest.cmake b/Tests/RunCMake/cmake_host_system_information/RunCMakeTest.cmake new file mode 100644 index 0000000..be74ade --- /dev/null +++ b/Tests/RunCMake/cmake_host_system_information/RunCMakeTest.cmake @@ -0,0 +1,8 @@ +include(RunCMake) + +run_cmake(BadArg1) +run_cmake(BadArg2) +run_cmake(BadArg3) + +run_cmake(QueryList) +run_cmake(QueryKeys) -- cgit v0.12