diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-24 18:36:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-24 18:36:50 (GMT) |
| commit | 4ec0329bf1cc39eddfa9dd5c58e83992b8979181 (patch) | |
| tree | c174239fd9d8ffadbe29e35df76fbff6b932bb4b /Tests | |
| parent | de21e564edddd8a2e53f6982ef8994fd6758170a (diff) | |
| parent | 9b8dc79cc84d12c1e661ca3cd77b773b463508d7 (diff) | |
| download | CMake-4ec0329bf1cc39eddfa9dd5c58e83992b8979181.zip CMake-4ec0329bf1cc39eddfa9dd5c58e83992b8979181.tar.gz CMake-4ec0329bf1cc39eddfa9dd5c58e83992b8979181.tar.bz2 | |
Merge branch 'cmake-server-message-quoting' into release
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Server/cmakelib.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tests/Server/cmakelib.py b/Tests/Server/cmakelib.py index 94384eb..d11431d 100644 --- a/Tests/Server/cmakelib.py +++ b/Tests/Server/cmakelib.py @@ -46,11 +46,11 @@ def waitForRawMessage(cmakeCommand): stdoutdata += stdoutdataLine.decode('utf-8') else: break - begin = stdoutdata.find("[== CMake Server ==[\n") - end = stdoutdata.find("]== CMake Server ==]") + begin = stdoutdata.find('[== "CMake Server" ==[\n') + end = stdoutdata.find(']== "CMake Server" ==]') if (begin != -1 and end != -1): - begin += len("[== CMake Server ==[\n") + begin += len('[== "CMake Server" ==[\n') payload = stdoutdata[begin:end] if print_communication: print("\nSERVER>", json.loads(payload), "\n") @@ -59,9 +59,9 @@ def waitForRawMessage(cmakeCommand): def writeRawData(cmakeCommand, content): writeRawData.counter += 1 payload = """ -[== CMake Server ==[ +[== "CMake Server" ==[ %s -]== CMake Server ==] +]== "CMake Server" ==] """ % content rn = ( writeRawData.counter % 2 ) == 0 |