From 539c5c252ef679d15f3af828da304ad9313640e2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sun, 25 Jan 2015 08:09:10 -0500 Subject: Tests: Shorten paths in RunCMake.CompileFeatures Shorten the NotAFeature_OriginDebug_target_compile_features case name to avoid creating really long paths that fail with some tools on Windows. --- .../CompileFeatures/NotAFeature_OriginDebugCommand-result.txt | 1 + .../CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt | 5 +++++ Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake | 4 ++++ .../NotAFeature_OriginDebug_target_compile_features-result.txt | 1 - .../NotAFeature_OriginDebug_target_compile_features-stderr.txt | 5 ----- .../NotAFeature_OriginDebug_target_compile_features.cmake | 4 ---- Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt create mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt create mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake delete mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt delete mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt delete mode 100644 Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt new file mode 100644 index 0000000..1f2c113 --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand-stderr.txt @@ -0,0 +1,5 @@ +CMake Error at NotAFeature_OriginDebugCommand.cmake:4 \(target_compile_features\): + target_compile_features specified unknown feature "not_a_feature" for + target "somelib". +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake new file mode 100644 index 0000000..467d9a1 --- /dev/null +++ b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebugCommand.cmake @@ -0,0 +1,4 @@ + +set(CMAKE_DEBUG_TARGET_PROPERTIES COMPILE_FEATURES) +add_library(somelib STATIC empty.cpp) +target_compile_features(somelib PRIVATE not_a_feature) diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt deleted file mode 100644 index d00491f..0000000 --- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt deleted file mode 100644 index d819d15..0000000 --- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error at NotAFeature_OriginDebug_target_compile_features.cmake:4 \(target_compile_features\): - target_compile_features specified unknown feature "not_a_feature" for - target "somelib". -Call Stack \(most recent call first\): - CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake b/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake deleted file mode 100644 index 467d9a1..0000000 --- a/Tests/RunCMake/CompileFeatures/NotAFeature_OriginDebug_target_compile_features.cmake +++ /dev/null @@ -1,4 +0,0 @@ - -set(CMAKE_DEBUG_TARGET_PROPERTIES COMPILE_FEATURES) -add_library(somelib STATIC empty.cpp) -target_compile_features(somelib PRIVATE not_a_feature) diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake index 1892a5c..376f75a 100644 --- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake +++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake @@ -6,7 +6,7 @@ run_cmake(NotAFeatureTransitive) run_cmake(NotAFeature_OriginDebug) run_cmake(NotAFeature_OriginDebugGenex) run_cmake(NotAFeature_OriginDebugTransitive) -run_cmake(NotAFeature_OriginDebug_target_compile_features) +run_cmake(NotAFeature_OriginDebugCommand) run_cmake(generate_feature_list) file(READ -- cgit v0.12