diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-28 12:27:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-28 12:27:21 (GMT) |
| commit | a316f5fd6d01ce0ba452671eb0b41812db9bf81b (patch) | |
| tree | 204a480143cb47281ff9a7bb89c9523c0f5310aa /Tests | |
| parent | 075cc0f28c4409b94f1baaf6405acf923abfb1b6 (diff) | |
| parent | 42ccbee11c1b3be12c5ebb9f69cb769d79d491ad (diff) | |
| download | CMake-a316f5fd6d01ce0ba452671eb0b41812db9bf81b.zip CMake-a316f5fd6d01ce0ba452671eb0b41812db9bf81b.tar.gz CMake-a316f5fd6d01ce0ba452671eb0b41812db9bf81b.tar.bz2 | |
Merge branch 'cmake-server-handshake-improvements' into release
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Server/tc_handshake.json | 4 |
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"} }, |