From 736bcb9664b714b91e8a2a573451e0453716f4da Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 30 Nov 2014 13:54:18 +0100 Subject: [PATCH] Tests: Move IfacePaths test stderr files. Rename the files with a property-specific name, so that additional properties can be easily tested. --- ...inInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...nInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...=> BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...stderr.txt => InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...stderr.txt => InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...rr.txt => RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...xt => RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt} | 0 Tests/RunCMake/IfacePaths/RunCMakeTest.cmake | 1 + ...=> SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...rcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} | 0 ...cInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} | 0 11 files changed, 1 insertion(+) rename Tests/RunCMake/IfacePaths/{BinInInstallPrefix-CMP0052-NEW-stderr.txt => BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{BinInInstallPrefix-CMP0052-WARN-stderr.txt => BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{BinaryDirectoryInInterface-stderr.txt => BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{InstallInBinDir-stderr.txt => InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{InstallInSrcDir-stderr.txt => InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{RelativePathInGenex-stderr.txt => RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{RelativePathInInterface-stderr.txt => RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{SourceDirectoryInInterface-stderr.txt => SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{SrcInInstallPrefix-CMP0052-NEW-stderr.txt => SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt} (100%) rename Tests/RunCMake/IfacePaths/{SrcInInstallPrefix-CMP0052-WARN-stderr.txt => SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt} (100%) diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr.txt rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr.txt rename to Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr.txt rename to Tests/RunCMake/IfacePaths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/InstallInBinDir-stderr.txt rename to Tests/RunCMake/IfacePaths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt b/Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr.txt rename to Tests/RunCMake/IfacePaths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr.txt rename to Tests/RunCMake/IfacePaths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt b/Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr.txt rename to Tests/RunCMake/IfacePaths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake b/Tests/RunCMake/IfacePaths/RunCMakeTest.cmake index 8febf1805..489e3dfbf 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_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr.txt rename to Tests/RunCMake/IfacePaths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr.txt rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt similarity index 100% rename from Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr.txt rename to Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt