diff options
| author | Rui Abreu Ferreira <raf-ep@gmx.com> | 2015-12-20 23:11:23 +0000 |
|---|---|---|
| committer | Rui Abreu Ferreira <raf-ep@gmx.com> | 2016-08-07 21:57:29 +0100 |
| commit | 25ec29d4e145f5b3b86d28e5d401c2d913fadded (patch) | |
| tree | 30231320ccea329a89dff469c67982915dc59ce0 | |
| parent | 9da4d1b4cba7fab0636b8b48e48ff4e508ceb853 (diff) | |
| download | rneovim-25ec29d4e145f5b3b86d28e5d401c2d913fadded.tar.gz rneovim-25ec29d4e145f5b3b86d28e5d401c2d913fadded.tar.bz2 rneovim-25ec29d4e145f5b3b86d28e5d401c2d913fadded.zip | |
Windows: Fix functionaltest fixtures
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | test/functional/fixtures/tty-test.c | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1787f4e306..3877699af9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,7 +398,11 @@ message(STATUS "Using the Lua interpreter ${LUA_PRG}.") find_program(BUSTED_PRG busted) find_program(BUSTED_LUA_PRG busted-lua) if(NOT BUSTED_OUTPUT_TYPE) - set(BUSTED_OUTPUT_TYPE "utfTerminal") + if(WIN32) + set(BUSTED_OUTPUT_TYPE "plainTerminal") + else() + set(BUSTED_OUTPUT_TYPE "utfTerminal") + endif() endif() find_program(LUACHECK_PRG luacheck) @@ -466,7 +470,11 @@ if(BUSTED_PRG) ${CMAKE_BINARY_DIR}/test/config/paths.lua) set(UNITTEST_PREREQS nvim-test unittest-headers) - set(FUNCTIONALTEST_PREREQS nvim tty-test shell-test) + if(WIN32) + set(FUNCTIONALTEST_PREREQS nvim shell-test) + else() + set(FUNCTIONALTEST_PREREQS nvim tty-test shell-test) + endif() set(BENCHMARK_PREREQS nvim tty-test) # Useful for automated build systems, if they want to manually run the tests. diff --git a/test/functional/fixtures/tty-test.c b/test/functional/fixtures/tty-test.c index 40ba131003..ca905ce65e 100644 --- a/test/functional/fixtures/tty-test.c +++ b/test/functional/fixtures/tty-test.c @@ -31,12 +31,14 @@ static void walk_cb(uv_handle_t *handle, void *arg) { } } +#ifndef WIN32 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); } +#endif // static void sigwinch_cb(uv_signal_t *handle, int signum) // { @@ -135,6 +137,7 @@ int main(int argc, char **argv) uv_tty_set_mode(&tty, UV_TTY_MODE_RAW); tty.data = &interrupted; uv_read_start((uv_stream_t *)&tty, alloc_cb, read_cb); +#ifndef WIN32 struct sigaction sa; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; @@ -144,6 +147,7 @@ int main(int argc, char **argv) // uv_signal_init(uv_default_loop(), &sigwinch_watcher); // sigwinch_watcher.data = &tty; // uv_signal_start(&sigwinch_watcher, sigwinch_cb, SIGWINCH); +#endif uv_run(uv_default_loop(), UV_RUN_DEFAULT); return 0; |