summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-01-26 19:46:21 (GMT)
committerBrad King <brad.king@kitware.com>2024-01-27 14:57:48 (GMT)
commit2b5447d4a8a35f58e97a42270202a5dad3277dc4 (patch)
tree01d420d15ff33a51aedd69743703a448772b001c
parent10f906106e7d05cfe7f4c0ea871ad8462df2f89c (diff)
downloadCMake-2b5447d4a8a35f58e97a42270202a5dad3277dc4.zip
CMake-2b5447d4a8a35f58e97a42270202a5dad3277dc4.tar.gz
CMake-2b5447d4a8a35f58e97a42270202a5dad3277dc4.tar.bz2
Tests: Shorten RunCMake.CrosscompilingEmulator executable names
Also switch to pure C.
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake5
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddCustomCommandWithArg.cmake3
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddCustomTarget.cmake5
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddCustomTargetWithArg.cmake3
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-NEW.cmake14
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake15
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake20
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/AddTest/CMakeLists.txt7
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/CMakeLists.txt2
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/CrosscompilingEmulatorProperty.cmake8
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/TryRun.cmake5
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/emulator_unexpected.c (renamed from Tests/RunCMake/CrosscompilingEmulator/generated_exe_emulator_unexpected.cxx)3
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/main.c4
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.c4
-rw-r--r--Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx4
15 files changed, 58 insertions, 44 deletions
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddCustomCommand.cmake
index 9fcc5bc..30cbbe3 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 d9059ca..be30dbc 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 5b01abc..3682577 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 dcd80d5..e98c66f 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 9f9547c..5550b91 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 $<TARGET_FILE:generated_exe>)
+ COMMAND $<TARGET_FILE:exe>)
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 $<TARGET_FILE:generated_exe_in_subdir_added_to_test_with_genex>)
+ COMMAND $<TARGET_FILE:subdir_exe_with_genex>)
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest-CMP0158-OLD.cmake
index 910f1b4..e85fd40 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 $<TARGET_FILE:generated_exe>)
+ COMMAND $<TARGET_FILE:exe>)
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 $<TARGET_FILE:generated_exe_in_subdir_added_to_test_with_genex>)
+ COMMAND $<TARGET_FILE:subdir_exe_with_genex>)
diff --git a/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake b/Tests/RunCMake/CrosscompilingEmulator/AddTest.cmake
index 4bcb2cf..15ec4ff 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 $<TARGET_FILE:generated_exe>)
+ COMMAND $<TARGET_FILE:exe>)
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 $<TARGET_FILE:generated_exe_in_subdir_added_to_test_with_genex>)
+ COMMAND $<TARGET_FILE:subdir_exe_with_genex>)
-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 025b54c..fa20ae9 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 12a7fd4..93ee9df 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 2fdefc4..e9258fd 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 8cd5a02..448c924 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
index 233f432..e6bbcff 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 0000000..8488f4e
--- /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 0000000..a388185
--- /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 6ce7183..0000000
--- a/Tests/RunCMake/CrosscompilingEmulator/simple_src_exiterror.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-int main(int, char**)
-{
- return 13;
-}