aboutsummaryrefslogtreecommitdiff
path: root/test/functional/fixtures
diff options
context:
space:
mode:
authorScott Prager <splinterofchaos@gmail.com>2015-04-13 23:53:16 -0400
committerScott Prager <splinterofchaos@gmail.com>2015-05-02 09:47:29 -0400
commit74aef8972048c3288a3cbd6a8dadf17a8df3c08c (patch)
tree85397b18d46b464466ba0dad85bd7ca0000b2f4f /test/functional/fixtures
parent205466830207a920c62146b7b689fac2e395431a (diff)
downloadrneovim-74aef8972048c3288a3cbd6a8dadf17a8df3c08c.tar.gz
rneovim-74aef8972048c3288a3cbd6a8dadf17a8df3c08c.tar.bz2
rneovim-74aef8972048c3288a3cbd6a8dadf17a8df3c08c.zip
term: use an argument vector for termopen().
Old behaviour: termopen('cmd') would run `&shell &shcf "cmd"`, which caused the functional tests to fail on some systems due to the process not "owning" the terminal. Also, it is inconsistent with jobstart(). Modify termopen() so that &shell is not invoked, but maintain the old behaviour with :terminal. Factor the common code for building the argument vector from jobstart() and modify the functional tests to call termopen() instead of :terminal (fixes #2354). Also: * Add a 'name' option for termopen() so that `:terminal {cmd}` produces a buffer named "term//{cwd}/{cmd}" and termopen() users can customize the name. * Update the documentation. * Add functional tests for `:terminal` sinse its behaviour now differs from termopen(). Add "test/functional/fixtures/shell-test.c" and move "test/functional/job/tty-test.c" there, too. Helped-by: Justin M. Keyes <@justinmk>
Diffstat (limited to 'test/functional/fixtures')
-rw-r--r--test/functional/fixtures/CMakeLists.txt4
-rw-r--r--test/functional/fixtures/shell-test.c25
-rw-r--r--test/functional/fixtures/tty-test.c150
3 files changed, 179 insertions, 0 deletions
diff --git a/test/functional/fixtures/CMakeLists.txt b/test/functional/fixtures/CMakeLists.txt
new file mode 100644
index 0000000000..70aee6efa9
--- /dev/null
+++ b/test/functional/fixtures/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_executable(tty-test tty-test.c)
+target_link_libraries(tty-test ${LIBUV_LIBRARIES})
+
+add_executable(shell-test shell-test.c)
diff --git a/test/functional/fixtures/shell-test.c b/test/functional/fixtures/shell-test.c
new file mode 100644
index 0000000000..5fa8a58049
--- /dev/null
+++ b/test/functional/fixtures/shell-test.c
@@ -0,0 +1,25 @@
+// A simple implementation of a shell for testing
+// `termopen([&sh, &shcf, '{cmd'}])` and `termopen([&sh])`.
+//
+// If launched with no arguments, prints "ready $ ", otherwise prints
+// "ready $ {cmd}\n".
+
+#include <stdio.h>
+#include <string.h>
+
+int main(int argc, char **argv)
+{
+ fprintf(stderr, "ready $ ");
+
+ if (argc == 3) {
+ // argv should be {"terminal-test", "EXE", "prog args..."}
+ if (strcmp(argv[1], "EXE") != 0) {
+ fprintf(stderr, "first argument must be 'EXE'\n");
+ return 2;
+ }
+
+ fprintf(stderr, "%s\n", argv[2]);
+ }
+
+ return 0;
+}
diff --git a/test/functional/fixtures/tty-test.c b/test/functional/fixtures/tty-test.c
new file mode 100644
index 0000000000..40ba131003
--- /dev/null
+++ b/test/functional/fixtures/tty-test.c
@@ -0,0 +1,150 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <uv.h>
+
+uv_tty_t tty;
+
+#ifdef _WIN32
+#include <windows.h>
+bool owns_tty(void)
+{
+ HWND consoleWnd = GetConsoleWindow();
+ DWORD dwProcessId;
+ GetWindowThreadProcessId(consoleWnd, &dwProcessId);
+ return GetCurrentProcessId() == dwProcessId;
+}
+#else
+#include <unistd.h>
+bool owns_tty(void)
+{
+ return getsid(0) == getpid();
+}
+#endif
+
+#define is_terminal(stream) (uv_guess_handle(fileno(stream)) == UV_TTY)
+#define BUF_SIZE 0xfff
+
+static void walk_cb(uv_handle_t *handle, void *arg) {
+ if (!uv_is_closing(handle)) {
+ uv_close(handle, NULL);
+ }
+}
+
+static void sigwinch_handler(int signum)
+{
+ int width, height;
+ uv_tty_get_winsize(&tty, &width, &height);
+ fprintf(stderr, "rows: %d, cols: %d\n", height, width);
+}
+
+// static void sigwinch_cb(uv_signal_t *handle, int signum)
+// {
+// int width, height;
+// uv_tty_t *tty = handle->data;
+// uv_tty_get_winsize(tty, &width, &height);
+// fprintf(stderr, "rows: %d, cols: %d\n", height, width);
+// }
+
+static void alloc_cb(uv_handle_t *handle, size_t suggested, uv_buf_t *buf)
+{
+ buf->len = BUF_SIZE;
+ buf->base = malloc(BUF_SIZE);
+}
+
+static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf)
+{
+ if (cnt <= 0) {
+ uv_read_stop(stream);
+ return;
+ }
+
+ int *interrupted = stream->data;
+
+ for (int i = 0; i < cnt; i++) {
+ if (buf->base[i] == 3) {
+ (*interrupted)++;
+ }
+ }
+
+ uv_loop_t write_loop;
+ uv_loop_init(&write_loop);
+ uv_tty_t out;
+ uv_tty_init(&write_loop, &out, 1, 0);
+ uv_write_t req;
+ uv_buf_t b = {.base = buf->base, .len = (size_t)cnt};
+ uv_write(&req, (uv_stream_t *)&out, &b, 1, NULL);
+ uv_run(&write_loop, UV_RUN_DEFAULT);
+ uv_close((uv_handle_t *)&out, NULL);
+ uv_run(&write_loop, UV_RUN_DEFAULT);
+ if (uv_loop_close(&write_loop)) {
+ abort();
+ }
+ free(buf->base);
+
+ if (*interrupted >= 2) {
+ uv_walk(uv_default_loop(), walk_cb, NULL);
+ } else if (*interrupted == 1) {
+ fprintf(stderr, "interrupt received, press again to exit\n");
+ }
+}
+
+static void prepare_cb(uv_prepare_t *handle)
+{
+ fprintf(stderr, "tty ready\n");
+ uv_prepare_stop(handle);
+}
+
+int main(int argc, char **argv)
+{
+ if (!owns_tty()) {
+ fprintf(stderr, "process does not own the terminal\n");
+ exit(2);
+ }
+
+ if (!is_terminal(stdin)) {
+ fprintf(stderr, "stdin is not a terminal\n");
+ exit(2);
+ }
+
+ if (!is_terminal(stdout)) {
+ fprintf(stderr, "stdout is not a terminal\n");
+ exit(2);
+ }
+
+ if (!is_terminal(stderr)) {
+ fprintf(stderr, "stderr is not a terminal\n");
+ exit(2);
+ }
+
+ if (argc > 1) {
+ int count = atoi(argv[1]);
+ for (int i = 0; i < count; ++i) {
+ printf("line%d\n", i);
+ }
+ fflush(stdout);
+ return 0;
+ }
+
+ int interrupted = 0;
+ uv_prepare_t prepare;
+ uv_prepare_init(uv_default_loop(), &prepare);
+ uv_prepare_start(&prepare, prepare_cb);
+ // uv_tty_t tty;
+ uv_tty_init(uv_default_loop(), &tty, fileno(stderr), 1);
+ uv_tty_set_mode(&tty, UV_TTY_MODE_RAW);
+ tty.data = &interrupted;
+ uv_read_start((uv_stream_t *)&tty, alloc_cb, read_cb);
+ struct sigaction sa;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ sa.sa_handler = sigwinch_handler;
+ sigaction(SIGWINCH, &sa, NULL);
+ // uv_signal_t sigwinch_watcher;
+ // uv_signal_init(uv_default_loop(), &sigwinch_watcher);
+ // sigwinch_watcher.data = &tty;
+ // uv_signal_start(&sigwinch_watcher, sigwinch_cb, SIGWINCH);
+ uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+
+ return 0;
+}