summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-10-27 09:34:45 (GMT)
committerBrad King <brad.king@kitware.com>2016-10-27 18:18:42 (GMT)
commitd792491c405ce47bcd779f53fa0f9422bb3df494 (patch)
tree1fd9a4ae29a16c0aef133a3ad89566fc74806569 /Tests
parent9b8dc79cc84d12c1e661ca3cd77b773b463508d7 (diff)
downloadCMake-d792491c405ce47bcd779f53fa0f9422bb3df494.zip
CMake-d792491c405ce47bcd779f53fa0f9422bb3df494.tar.gz
CMake-d792491c405ce47bcd779f53fa0f9422bb3df494.tar.bz2
cmake-server: Better error reporting during handshake
Catch more problematic input during handshake and report failure. These were caught before when trying to configure, but it is way better to get these reports early.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/Server/tc_handshake.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/Server/tc_handshake.json b/Tests/Server/tc_handshake.json
index 5261581..975bb3d 100644
--- a/Tests/Server/tc_handshake.json
+++ b/Tests/Server/tc_handshake.json
@@ -59,10 +59,10 @@
{ "recv": {"cookie":"zimtstern","inReplyTo":"handshake","type":"error","errorMessage":"Failed to activate protocol version: \"generator\" is unset but required."} },
{ "send": {"cookie":"zimtstern","type": "handshake","protocolVersion":{"major":1},"sourceDirectory":".","buildDirectory":"/tmp/build","generator":"XXXX","extraGenerator":"CodeBlocks"} },
-{ "recv": {"cookie":"zimtstern","inReplyTo":"handshake","type":"error","errorMessage":"Failed to activate protocol version: Could not set up the requested combination of \"generator\" and \"extraGenerator\""} },
+{ "recv": {"cookie":"zimtstern","inReplyTo":"handshake","type":"error","errorMessage":"Failed to activate protocol version: Generator \"XXXX\" not supported."} },
{ "send": {"cookie":"zimtstern","type": "handshake","protocolVersion":{"major":1},"sourceDirectory":".","buildDirectory":"/tmp/build","generator":"Ninja","extraGenerator":"XXXX"} },
-{ "recv": {"cookie":"zimtstern","inReplyTo":"handshake","type":"error","errorMessage":"Failed to activate protocol version: Could not set up the requested combination of \"generator\" and \"extraGenerator\""} },
+{ "recv": {"cookie":"zimtstern","inReplyTo":"handshake","type":"error","errorMessage":"Failed to activate protocol version: The combination of generator \"Ninja\" and extra generator \"XXXX\" is not supported."} },
{ "send": {"cookie":"zimtstern","type": "handshake","protocolVersion":{"major":1},"sourceDirectory":".","buildDirectory":"/tmp/build","generator":"Ninja","extraGenerator":"CodeBlocks"} },
{ "recv": {"cookie":"zimtstern","inReplyTo":"handshake","type":"reply"} },