From 2b5447d4a8a35f58e97a42270202a5dad3277dc4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 26 Jan 2024 14:46:21 -0500 Subject: [PATCH] Tests: Shorten RunCMake.CrosscompilingEmulator executable names Also switch to pure C. --- .../AddCustomCommand.cmake | 5 +++-- .../AddCustomCommandWithArg.cmake | 3 ++- .../AddCustomTarget.cmake | 5 +++-- .../AddCustomTargetWithArg.cmake | 3 ++- .../AddTest-CMP0158-NEW.cmake | 14 +++++++------ .../AddTest-CMP0158-OLD.cmake | 15 +++++++------- .../CrosscompilingEmulator/AddTest.cmake | 20 ++++++++++--------- .../AddTest/CMakeLists.txt | 7 ++----- .../CrosscompilingEmulator/CMakeLists.txt | 2 +- .../CrosscompilingEmulatorProperty.cmake | 8 +++++--- .../CrosscompilingEmulator/TryRun.cmake | 5 +++-- ...r_unexpected.cxx => emulator_unexpected.c} | 3 ++- Tests/RunCMake/CrosscompilingEmulator/main.c | 4 ++++ .../simple_src_exiterror.c | 4 ++++ .../simple_src_exiterror.cxx | 4 ---- 15 files changed, 58 insertions(+), 44 deletions(-) rename Tests/RunCMake/CrosscompilingEmulator/{generated_exe_emulator_unexpected.cxx => emulator_unexpected.c} (79%) create mode 100644 Tests/RunCMake/CrosscompilingEmulator/main.c create mode 100644 Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.c delete mode 100644 Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake index 9fcc5bcd7b..30cbbe3d17 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake @@ -1,10 +1,11 @@ +enable_language(C) set(CMAKE_CROSSCOMPILING 1) # Executable: Return error code different from 0 -add_executable(generated_exe_emulator_expected simple_src_exiterror.cxx) +add_executable(generated_exe_emulator_expected simple_src_exiterror.c) # Executable: Return error code equal to 0 -add_executable(generated_exe_emulator_unexpected generated_exe_emulator_unexpected.cxx) +add_executable(generated_exe_emulator_unexpected emulator_unexpected.c) # Place the executable in a predictable location. set_property(TARGET generated_exe_emulator_unexpected PROPERTY RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_BINARY_DIR}>) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommandWithArg.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommandWithArg.cmake index d9059ca6e9..be30dbc8fd 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommandWithArg.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommandWithArg.cmake @@ -1,7 +1,8 @@ +enable_language(C) set(CMAKE_CROSSCOMPILING 1) # Executable: Return error code different from 0 -add_executable(generated_exe_emulator_expected simple_src_exiterror.cxx) +add_executable(generated_exe_emulator_expected simple_src_exiterror.c) add_custom_command(OUTPUT output COMMAND generated_exe_emulator_expected diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddCustomTarget.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddCustomTarget.cmake index 5b01abc23d..3682577957 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddCustomTarget.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddCustomTarget.cmake @@ -1,10 +1,11 @@ +enable_language(C) set(CMAKE_CROSSCOMPILING 1) # Executable: Return error code different from 0 -add_executable(generated_exe_emulator_expected simple_src_exiterror.cxx) +add_executable(generated_exe_emulator_expected simple_src_exiterror.c) # Executable: Return error code equal to 0 -add_executable(generated_exe_emulator_unexpected generated_exe_emulator_unexpected.cxx) +add_executable(generated_exe_emulator_unexpected emulator_unexpected.c) # Place the executable in a predictable location. set_property(TARGET generated_exe_emulator_unexpected PROPERTY RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_CURRENT_BINARY_DIR}>) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddCustomTargetWithArg.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddCustomTargetWithArg.cmake index dcd80d53ac..e98c66f92f 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddCustomTargetWithArg.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddCustomTargetWithArg.cmake @@ -1,7 +1,8 @@ +enable_language(C) set(CMAKE_CROSSCOMPILING 1) # Executable: Return error code different from 0 -add_executable(generated_exe_emulator_expected simple_src_exiterror.cxx) +add_executable(generated_exe_emulator_expected simple_src_exiterror.c) add_custom_target(generate_output ALL generated_exe_emulator_expected diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-NEW.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-NEW.cmake index 9f9547c0bf..5550b91edf 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-NEW.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-NEW.cmake @@ -1,5 +1,7 @@ +enable_language(C) +enable_testing() if(CMAKE_CROSSCOMPILING) - message(FATAL_ERROR "cross compiling") + message(FATAL_ERROR "cross compiling") endif() cmake_policy(SET CMP0158 NEW) @@ -8,18 +10,18 @@ enable_testing() add_test(NAME DoesNotUseEmulator COMMAND ${CMAKE_COMMAND} -E echo "Hi") -add_executable(generated_exe simple_src_exiterror.cxx) +add_executable(exe main.c) add_test(NAME ShouldNotUseEmulator - COMMAND generated_exe) + COMMAND exe) add_test(NAME DoesNotUseEmulatorWithGenex - COMMAND $) + COMMAND $) add_subdirectory(AddTest) add_test(NAME ShouldNotUseEmulatorWithExecTargetFromSubdirAddedWithoutGenex - COMMAND generated_exe_in_subdir_added_to_test_without_genex) + COMMAND subdir_exe_no_genex) add_test(NAME DoesNotUseEmulatorWithExecTargetFromSubdirAddedWithGenex - COMMAND $) + COMMAND $) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake index 910f1b4595..e85fd40ecd 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake @@ -1,25 +1,26 @@ +enable_language(C) +enable_testing() if(CMAKE_CROSSCOMPILING) - message(FATAL_ERROR "cross compiling") + message(FATAL_ERROR "cross compiling") endif() cmake_policy(SET CMP0158 OLD) -enable_testing() add_test(NAME DoesNotUseEmulator COMMAND ${CMAKE_COMMAND} -E echo "Hi") -add_executable(generated_exe simple_src_exiterror.cxx) +add_executable(exe main.c) add_test(NAME UsesEmulator - COMMAND generated_exe) + COMMAND exe) add_test(NAME DoesNotUseEmulatorWithGenex - COMMAND $) + COMMAND $) add_subdirectory(AddTest) add_test(NAME UsesEmulatorWithExecTargetFromSubdirAddedWithoutGenex - COMMAND generated_exe_in_subdir_added_to_test_without_genex) + COMMAND subdir_exe_no_genex) add_test(NAME DoesNotUseEmulatorWithExecTargetFromSubdirAddedWithGenex - COMMAND $) + COMMAND $) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake index 4bcb2cf15a..15ec4ff988 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake @@ -1,26 +1,28 @@ -set(CMAKE_CROSSCOMPILING 1) +enable_language(C) enable_testing() +set(CMAKE_CROSSCOMPILING 1) + add_test(NAME DoesNotUseEmulator COMMAND ${CMAKE_COMMAND} -E echo "Hi") -add_executable(generated_exe simple_src_exiterror.cxx) +add_executable(exe main.c) add_test(NAME UsesEmulator - COMMAND generated_exe) + COMMAND exe) add_test(NAME DoesNotUseEmulatorWithGenex - COMMAND $) + COMMAND $) add_subdirectory(AddTest) add_test(NAME UsesEmulatorWithExecTargetFromSubdirAddedWithoutGenex - COMMAND generated_exe_in_subdir_added_to_test_without_genex) + COMMAND subdir_exe_no_genex) add_test(NAME DoesNotUseEmulatorWithExecTargetFromSubdirAddedWithGenex - COMMAND $) + COMMAND $) -add_executable(generated_exe_test_launcher simple_src_exiterror.cxx) -set_property(TARGET generated_exe_test_launcher PROPERTY TEST_LAUNCHER "pseudo_test_launcher") +add_executable(exe_test_launcher main.c) +set_property(TARGET exe_test_launcher PROPERTY TEST_LAUNCHER "pseudo_test_launcher") add_test(NAME UsesTestLauncherAndEmulator - COMMAND generated_exe_test_launcher) + COMMAND exe_test_launcher) diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt b/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt index 025b54c42c..fa20ae988b 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt +++ b/Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt @@ -1,5 +1,2 @@ -add_executable(generated_exe_in_subdir_added_to_test_without_genex - ${CMAKE_CURRENT_SOURCE_DIR}/../simple_src_exiterror.cxx) - -add_executable(generated_exe_in_subdir_added_to_test_with_genex - ${CMAKE_CURRENT_SOURCE_DIR}/../simple_src_exiterror.cxx) +add_executable(subdir_exe_no_genex ../main.c) +add_executable(subdir_exe_with_genex ../main.c) diff --git a/Tests/RunCMake/CrosscompilingEmulator/CMakeLists.txt b/Tests/RunCMake/CrosscompilingEmulator/CMakeLists.txt index 12a7fd463a..93ee9dfd5f 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/CMakeLists.txt +++ b/Tests/RunCMake/CrosscompilingEmulator/CMakeLists.txt @@ -1,3 +1,3 @@ cmake_minimum_required(VERSION 3.5) -project(${RunCMake_TEST} CXX) +project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake b/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake index 2fdefc4ce7..e9258fd5d8 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake @@ -1,9 +1,11 @@ # This tests setting the CROSSCOMPILING_EMULATOR target property from the # CMAKE_CROSSCOMPILING_EMULATOR variable. +enable_language(C) + # -DCMAKE_CROSSCOMPILING_EMULATOR=/path/to/pseudo_emulator is passed to this # test -add_executable(target_with_emulator simple_src_exiterror.cxx) +add_executable(target_with_emulator main.c) get_property(emulator TARGET target_with_emulator PROPERTY CROSSCOMPILING_EMULATOR) if(NOT "${emulator}" MATCHES "pseudo_emulator") @@ -20,14 +22,14 @@ if(NOT "${emulator}" MATCHES "another_emulator") endif() unset(CMAKE_CROSSCOMPILING_EMULATOR CACHE) -add_executable(target_without_emulator simple_src_exiterror.cxx) +add_executable(target_without_emulator main.c) get_property(emulator TARGET target_without_emulator PROPERTY CROSSCOMPILING_EMULATOR) if(NOT "${emulator}" STREQUAL "") message(SEND_ERROR "Default CROSSCOMPILING_EMULATOR property not set to null") endif() -add_executable(target_with_empty_emulator simple_src_exiterror.cxx) +add_executable(target_with_empty_emulator main.c) set_property(TARGET target_with_empty_emulator PROPERTY CROSSCOMPILING_EMULATOR "") enable_testing() diff --git a/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake b/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake index 8cd5a02f93..448c9244b5 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake +++ b/Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake @@ -1,10 +1,11 @@ +enable_language(C) set(CMAKE_CROSSCOMPILING 1) set(ENV{PSEUDO_EMULATOR_FAIL} 1) try_run(run_result compile_result ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.cxx + ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.c RUN_OUTPUT_VARIABLE run_output) message(STATUS "run_output: ${run_output}") @@ -15,6 +16,6 @@ set(CMAKE_CROSSCOMPILING_EMULATOR ${CMAKE_CROSSCOMPILING_EMULATOR} "multi arg") try_run(run_result compile_result ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.cxx + ${CMAKE_CURRENT_SOURCE_DIR}/simple_src_exiterror.c RUN_OUTPUT_VARIABLE run_output) message(STATUS "Emulator with arguments run_output: ${run_output}") diff --git a/Tests/RunCMake/CrosscompilingEmulator/generated_exe_emulator_unexpected.cxx b/Tests/RunCMake/CrosscompilingEmulator/emulator_unexpected.c similarity index 79% rename from Tests/RunCMake/CrosscompilingEmulator/generated_exe_emulator_unexpected.cxx rename to Tests/RunCMake/CrosscompilingEmulator/emulator_unexpected.c index 233f432d53..e6bbcff0d3 100644 --- a/Tests/RunCMake/CrosscompilingEmulator/generated_exe_emulator_unexpected.cxx +++ b/Tests/RunCMake/CrosscompilingEmulator/emulator_unexpected.c @@ -2,7 +2,8 @@ int main(int argc, const char* argv[]) { - for (int i = 1; i < argc; ++i) { + int i; + for (i = 1; i < argc; ++i) { fprintf(stderr, "unexpected argument: '%s'\n", argv[i]); } return argc == 1 ? 0 : 1; diff --git a/Tests/RunCMake/CrosscompilingEmulator/main.c b/Tests/RunCMake/CrosscompilingEmulator/main.c new file mode 100644 index 0000000000..8488f4e58f --- /dev/null +++ b/Tests/RunCMake/CrosscompilingEmulator/main.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 0; +} diff --git a/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.c b/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.c new file mode 100644 index 0000000000..a388185c9f --- /dev/null +++ b/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 13; +} diff --git a/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx b/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx deleted file mode 100644 index 6ce7183867..0000000000 --- a/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx +++ /dev/null @@ -1,4 +0,0 @@ -int main(int, char**) -{ - return 13; -}