Permalink
Browse files

patch 8.0.0804: running tests fails when stdin is /dev/null

Problem:    Running tests fails when stdin is /dev/null. (James McCoy)
Solution:   Do not bail out from getting input if the --not-a-term argument
            was given. (closes #1460)
  • Loading branch information...
brammool committed Jul 29, 2017
1 parent c6df10e commit 91d348abfc0d7ac9b5b19cde0112de8ae4335602
Showing with 8 additions and 4 deletions.
  1. +3 −2 src/eval.c
  2. +3 −2 src/evalfunc.c
  3. +2 −0 src/version.c
View
@@ -8070,8 +8070,9 @@ get_user_input(
rettv->vval.v_string = NULL;
#ifdef NO_CONSOLE_INPUT
/* While starting up, there is no place to enter text. */
if (no_console_input())
/* While starting up, there is no place to enter text. When running tests
* with --not-a-term we assume feedkeys() will be used. */
if (no_console_input() && !is_not_a_term())
return;
#endif
View
@@ -6482,8 +6482,9 @@ f_inputlist(typval_T *argvars, typval_T *rettv)
int mouse_used;
#ifdef NO_CONSOLE_INPUT
/* While starting up, there is no place to enter text. */
if (no_console_input())
/* While starting up, there is no place to enter text. When running tests
* with --not-a-term we assume feedkeys() will be used. */
if (no_console_input() && !is_not_a_term())
return;
#endif
if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL)
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
804,
/**/
803,
/**/

0 comments on commit 91d348a

Please sign in to comment.