From 736bcb9664b714b91e8a2a573451e0453716f4da Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 30 Nov 2014 13:54:18 +0100 Subject: Tests: Move IfacePaths test stderr files. Rename the files with a property-specific name, so that additional properties can be easily tested. --- .../BinInInstallPrefix-CMP0052-NEW-stderr.txt | 6 ------ ...Prefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt | 6 ++++++ .../BinInInstallPrefix-CMP0052-WARN-stderr.txt | 20 -------------------- ...refix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt | 20 ++++++++++++++++++++ .../IfacePaths/BinaryDirectoryInInterface-stderr.txt | 6 ------ ...rectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt | 6 ++++++ Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt | 6 ------ .../InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt | 6 ++++++ Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt | 6 ------ .../InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt | 6 ++++++ .../IfacePaths/RelativePathInGenex-stderr.txt | 5 ----- ...elativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt | 5 +++++ .../IfacePaths/RelativePathInInterface-stderr.txt | 5 ----- ...ivePathInInterface-stderr_INCLUDE_DIRECTORIES.txt | 5 +++++ Tests/RunCMake/IfacePaths/RunCMakeTest.cmake | 1 + .../IfacePaths/SourceDirectoryInInterface-stderr.txt | 6 ------ ...rectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt | 6 ++++++ .../SrcInInstallPrefix-CMP0052-NEW-stderr.txt | 6 ------ ...Prefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt | 6 ++++++ .../SrcInInstallPrefix-CMP0052-WARN-stderr.txt | 20 -------------------- ...refix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt | 20 ++++++++++++++++++++ 21 files changed, 87 insertions(+), 86 deletions(-) delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt delete mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt deleted file mode 100644 index f2d749b..0000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo" - - which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..f2d749b --- /dev/null +++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo" + + which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt deleted file mode 100644 index 3d83892..0000000 --- a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt +++ /dev/null @@ -1,20 +0,0 @@ -CMake Warning \(dev\) in CMakeLists.txt: - Policy CMP0052 is not set: Reject source and build dirs in installed - INTERFACE_INCLUDE_DIRECTORIES. Run "cmake --help-policy CMP0052" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. - - Directory: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo" - - in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory - of the install directory: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix" - - however it is also a subdirectory of the build tree: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build" - -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..3d83892 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,20 @@ +CMake Warning \(dev\) in CMakeLists.txt: + Policy CMP0052 is not set: Reject source and build dirs in installed + INTERFACE_INCLUDE_DIRECTORIES. Run "cmake --help-policy CMP0052" for + policy details. Use the cmake_policy command to set the policy and + suppress this warning. + + Directory: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo" + + in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory + of the install directory: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix" + + however it is also a subdirectory of the build tree: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build" + +This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt deleted file mode 100644 index ed7cd58..0000000 --- a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - - ".*RunCMake/IfacePaths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo" - - which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..ed7cd58 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*RunCMake/IfacePaths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo" + + which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt deleted file mode 100644 index 3d60831..0000000 --- a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo" - - which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..3d60831 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo" + + which is prefixed in the build directory. diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt deleted file mode 100644 index 11994dd..0000000 --- a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/copy/foo" - - which is prefixed in the source directory. diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..11994dd --- /dev/null +++ b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/copy/foo" + + which is prefixed in the source directory. diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt deleted file mode 100644 index 490c700..0000000 --- a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" contains relative path in its - INTERFACE_INCLUDE_DIRECTORIES: - - "foo" diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..490c700 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,5 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" contains relative path in its + INTERFACE_INCLUDE_DIRECTORIES: + + "foo" diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt deleted file mode 100644 index f6cdb53..0000000 --- a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains - relative path: - - "foo" diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..f6cdb53 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,5 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains + relative path: + + "foo" diff --git a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake index 8febf18..489e3df 100644 --- a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake +++ b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake @@ -2,6 +2,7 @@ include(RunCMake) macro(run_cmake test) list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP}) + set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt) _run_cmake(${test}) endmacro() diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt deleted file mode 100644 index 97a94b1..0000000 --- a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - - ".*RunCMake/IfacePaths/foo" - - which is prefixed in the source directory. diff --git a/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..97a94b1 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*RunCMake/IfacePaths/foo" + + which is prefixed in the source directory. diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt deleted file mode 100644 index ed5df34..0000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt +++ /dev/null @@ -1,6 +0,0 @@ -CMake Error in CMakeLists.txt: - Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src/foo" - - which is prefixed in the source directory. diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..ed5df34 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,6 @@ +CMake Error in CMakeLists.txt: + Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src/foo" + + which is prefixed in the source directory. diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt deleted file mode 100644 index cb5a51c..0000000 --- a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt +++ /dev/null @@ -1,20 +0,0 @@ -CMake Warning \(dev\) in CMakeLists.txt: - Policy CMP0052 is not set: Reject source and build dirs in installed - INTERFACE_INCLUDE_DIRECTORIES. Run "cmake --help-policy CMP0052" for - policy details. Use the cmake_policy command to set the policy and - suppress this warning. - - Directory: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src/foo" - - in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory - of the install directory: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix" - - however it is also a subdirectory of the source tree: - - ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src" - -This warning is for project developers. Use -Wno-dev to suppress it. diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt new file mode 100644 index 0000000..cb5a51c --- /dev/null +++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt @@ -0,0 +1,20 @@ +CMake Warning \(dev\) in CMakeLists.txt: + Policy CMP0052 is not set: Reject source and build dirs in installed + INTERFACE_INCLUDE_DIRECTORIES. Run "cmake --help-policy CMP0052" for + policy details. Use the cmake_policy command to set the policy and + suppress this warning. + + Directory: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src/foo" + + in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory + of the install directory: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix" + + however it is also a subdirectory of the source tree: + + ".*Tests/RunCMake/IfacePaths_INCLUDE_DIRECTORIES/prefix/src" + +This warning is for project developers. Use -Wno-dev to suppress it. -- cgit v0.12