diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/msgpack-gen.lua | 6 | ||||
| -rwxr-xr-x | scripts/travis.sh | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua index d303fde2fc..3cc1558fd7 100644 --- a/scripts/msgpack-gen.lua +++ b/scripts/msgpack-gen.lua @@ -111,7 +111,7 @@ end output:write([[ }; -void msgpack_rpc_dispatch(msgpack_object *req, msgpack_packer *res) +void msgpack_rpc_dispatch(uint64_t id, msgpack_object *req, msgpack_packer *res) { Error error = { .set = false }; uint64_t method_id = (uint32_t)req->via.array.ptr[2].via.u64; @@ -119,7 +119,9 @@ void msgpack_rpc_dispatch(msgpack_object *req, msgpack_packer *res) switch (method_id) { case 0: msgpack_pack_nil(res); - // The result is the `msgpack_metadata` byte array + // The result is the [channel_id, metadata] array + msgpack_pack_array(res, 2); + msgpack_pack_uint64(res, id); msgpack_pack_raw(res, sizeof(msgpack_metadata)); msgpack_pack_raw_body(res, msgpack_metadata, sizeof(msgpack_metadata)); return; diff --git a/scripts/travis.sh b/scripts/travis.sh index 3daa2652e5..2b97773b22 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -3,6 +3,7 @@ tmpdir="$(pwd)/tmp" rm -rf "$tmpdir" mkdir -p "$tmpdir" +suppressions="$(pwd)/.valgrind.supp" valgrind_check() { ( @@ -171,7 +172,7 @@ elif [ "$TRAVIS_BUILD_TYPE" = "api/python" ]; then sudo pip install . sudo pip install nose test_cmd="nosetests --verbosity=2" - nvim_cmd="valgrind -q --track-origins=yes --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE" + nvim_cmd="valgrind -q --track-origins=yes --leak-check=yes --suppressions=$suppressions --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE" if ! ../scripts/run-api-tests.exp "$test_cmd" "$nvim_cmd"; then valgrind_check "$tmpdir" exit 1 |