patch 7.4.2157

Problem:    Test_job_start_fails() is expected to report memory leaks, making
            it hard to see other leaks in test_partial.
Solution:   Move Test_job_start_fails() to a separate test file.

diff --git a/src/Makefile b/src/Makefile
index 273fc9ea9949aed7b17873cea78222494d9f87e2..35596599942a11c374bb0ba0db935f4fb02c84e2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2086,6 +2086,7 @@ test_arglist \
        test_history \
        test_increment \
        test_increment_dbcs \
+       test_job_fails \
        test_join \
        test_json \
        test_jumps \

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 9493ccb40e05401065f638cd08ff7e374b2d839b..0ff00660ced0d54640cd15a7b77185fa823c6c0f 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -176,6 +176,7 @@ NEW_TESTS = test_arglist.res \
            test_history.res \
            test_increment.res \
            test_increment_dbcs.res \
+           test_job_fails.res \
            test_json.res \
            test_langmap.res \
            test_man.res \

diff --git a/src/testdir/test_job_fails.vim b/src/testdir/test_job_fails.vim
new file mode 100644 (file)
index 0000000..ddab6a3
--- /dev/null
+++ b/src/testdir/test_job_fails.vim
@@ -0,0 +1,19 @@
+" This test is in a separate file, because it usually causes reports for memory
+" leaks under valgrind.  That is because when fork/exec fails memory is not
+" freed.  Since the process exists right away it's not a real leak.
+
+source shared.vim
+
+func Test_job_start_fails()
+  if has('job')
+    let g:job = job_start('axdfxsdf')
+    if has('unix')
+      call WaitFor('job_status(g:job) == "dead"')
+      call assert_equal('dead', job_status(g:job))
+    else
+      call WaitFor('job_status(g:job) == "fail"')
+      call assert_equal('fail', job_status(g:job))
+    endif
+    unlet g:job
+  endif
+endfunc

diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim
index 6b098c2ddd863eb012b89a61766796f92f50e58d..48c7697b478bdacc17b232384c370d0492157181 100644 (file)
--- a/src/testdir/test_partial.vim
+++ b/src/testdir/test_partial.vim
@@ -1,27 +1,5 @@
 " Test binding arguments to a Funcref.
  
-" NOTE: This function may cause memory leaks to be reported.
-" That is because when fork/exec fails memory is not freed.  Since the process
-" exists right away it's not a real leak.
-func Test_job_start_fails()
-  if has('job')
-    let job = job_start('axdfxsdf')
-    for i in range(100)
-      let status = job_status(job)
-      if status == 'dead' || status == 'fail'
-       break
-      endif
-      sleep 10m
-    endfor
-    if has('unix')
-      call assert_equal('dead', job_status(job))
-    else
-      call assert_equal('fail', job_status(job))
-    endif
-    unlet job
-  endif
-endfunc
-
 func MyFunc(arg1, arg2, arg3)
   return a:arg1 . '/' . a:arg2 . '/' . a:arg3
 endfunc

diff --git a/src/version.c b/src/version.c
index 17febd0562860aa7afa6d9c5f5dae4c83132c8f7..c5511beeb34ed023ca827423f58f27481e373c68 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2157,
 /**/
     2156,
 /**/