summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-01-14 14:02:59 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-01-14 14:03:09 (GMT)
commita2a91eb1416a5a48b7ba55973f3805998d0a643a (patch)
treeaf2c6d8152a14d5732fd5dc88f47481465def2b4 /Tests
parent03acdadb8ac3718ffecd94abfcff6ecb1194cc3b (diff)
parentca9100c5cea40cafe0d9a61f4263da2968dc50e0 (diff)
downloadCMake-a2a91eb1416a5a48b7ba55973f3805998d0a643a.zip
CMake-a2a91eb1416a5a48b7ba55973f3805998d0a643a.tar.gz
CMake-a2a91eb1416a5a48b7ba55973f3805998d0a643a.tar.bz2
Merge topic 'cross-ninja-improve-error-handling'
ca9100c5ce Ninja Multi-Config: Improve error handling when not doing cross-config build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4214
Diffstat (limited to 'Tests')
-rw-r--r--Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-all-build-stderr.txt4
-rw-r--r--Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-target-ninja-stderr.txt4
2 files changed, 2 insertions, 6 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-all-build-stderr.txt b/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-all-build-stderr.txt
index 95f42be..fa8b462 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-all-build-stderr.txt
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-all-build-stderr.txt
@@ -1,3 +1 @@
-^ninja: error: 'RelWithDebInfo/[^
-]*simplestatic[^
-]*', needed by 'all:RelWithDebInfo', missing and no known rule to make it$
+^ninja: error: unknown target 'all:RelWithDebInfo'$
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-target-ninja-stderr.txt b/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-target-ninja-stderr.txt
index 74191bb..1a1fe9e 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-target-ninja-stderr.txt
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleNoCross-relwithdebinfo-in-release-graph-target-ninja-stderr.txt
@@ -1,3 +1 @@
-^ninja: error: 'RelWithDebInfo/[^
-]*simplestatic[^
-]*', needed by 'simplestatic:RelWithDebInfo', missing and no known rule to make it$
+^ninja: error: unknown target 'simplestatic:RelWithDebInfo'$