Browse Source

Merge pull request #14321 from jamessan/ci-fixes

Some small cleanups/diagnostic improvements
pull/14332/head
James McCoy 4 weeks ago
committed by GitHub
parent
commit
e3d0fb0d3c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ci/common/test.sh
  2. 2
      src/nvim/event/libuv_process.c
  3. 2
      src/nvim/msgpack_rpc/channel.c
  4. 4
      src/nvim/os/pty_process_unix.c
  5. 6
      src/nvim/os/pty_process_win.c
  6. 6
      test/helpers.lua

2
ci/common/test.sh

@ -34,7 +34,7 @@ check_core_dumps() {
cores="$(find /cores/ -type f -print)"
local _sudo='sudo'
else
cores="$(find ./ -type f -name 'core.*' -print)"
cores="$(find ./ -type f \( -name 'core.*' -o -name core -o -name nvim.core \) -print)"
local _sudo=
fi

2
src/nvim/event/libuv_process.c

@ -82,7 +82,7 @@ int libuv_process_spawn(LibuvProcess *uvproc)
int status;
if ((status = uv_spawn(&proc->loop->uv, &uvproc->uv, &uvproc->uvopts))) {
ELOG("uv_spawn failed: %s", uv_strerror(status));
ELOG("uv_spawn(%s) failed: %s", uvproc->uvopts.file, uv_strerror(status));
if (uvproc->uvopts.env) {
os_free_fullenv(uvproc->uvopts.env);
}

2
src/nvim/msgpack_rpc/channel.c

@ -219,7 +219,7 @@ static void receive_msgpack(Stream *stream, RBuffer *rbuf, size_t c,
char buf[256];
snprintf(buf, sizeof(buf), "ch %" PRIu64 " was closed by the client",
channel->id);
call_set_error(channel, buf, WARN_LOG_LEVEL);
call_set_error(channel, buf, INFO_LOG_LEVEL);
goto end;
}

4
src/nvim/os/pty_process_unix.c

@ -175,7 +175,7 @@ static void init_child(PtyProcess *ptyproc)
Process *proc = (Process *)ptyproc;
if (proc->cwd && os_chdir(proc->cwd) != 0) {
ELOG("chdir failed: %s", strerror(errno));
ELOG("chdir(%s) failed: %s", proc->cwd, strerror(errno));
return;
}
@ -184,7 +184,7 @@ static void init_child(PtyProcess *ptyproc)
assert(proc->env);
environ = tv_dict_to_env(proc->env);
execvp(prog, proc->argv);
ELOG("execvp failed: %s: %s", strerror(errno), prog);
ELOG("execvp(%s) failed: %s", prog, strerror(errno));
_exit(122); // 122 is EXEC_FAILED in the Vim source.
}

6
src/nvim/os/pty_process_win.c

@ -203,11 +203,13 @@ int pty_process_spawn(PtyProcess *ptyproc)
cleanup:
if (status) {
// In the case of an error of MultiByteToWideChar or CreateProcessW.
ELOG("pty_process_spawn: %s: error code: %d", emsg, status);
ELOG("pty_process_spawn(%s): %s: error code: %d",
proc->argv[0], emsg, status);
status = os_translate_sys_error(status);
} else if (err != NULL) {
status = (int)winpty_error_code(err);
ELOG("pty_process_spawn: %s: error code: %d", emsg, status);
ELOG("pty_process_spawn(%s): %s: error code: %d",
proc->argv[0], emsg, status);
status = translate_winpty_error(status);
}
winpty_error_free(err);

6
test/helpers.lua

@ -365,7 +365,11 @@ function module.check_cores(app, force)
db_cmd = lldb_db_cmd
else
initial_path = '.'
re = '/core[^/]*$'
if 'freebsd' == module.uname() then
re = '/nvim.core$'
else
re = '/core[^/]*$'
end
exc_re = { '^/%.deps$', '^/%'..deps_prefix()..'$', local_tmpdir, '^/%node_modules$' }
db_cmd = gdb_db_cmd
random_skip = true

Loading…
Cancel
Save