summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-01 21:49:06 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-01 21:49:06 +0200
commitc5af40ae646ceda817eff93b4f9ba274f031bea6 (patch)
treea87818ca2c89922c3ac4384b880bfb59e62cd23a
parentbde9810d6103ffe3a22a9330021cb21db1ed1792 (diff)
downloadvim-git-c5af40ae646ceda817eff93b4f9ba274f031bea6.tar.gz
patch 7.4.1978v7.4.1978
Problem: Large file test does not delete its output. Solution: Delete the output. Check size properly when possible. (Ken Takata)
-rw-r--r--src/testdir/test_largefile.vim12
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 4 deletions
diff --git a/src/testdir/test_largefile.vim b/src/testdir/test_largefile.vim
index ea2b8ff62..1b3e02a0c 100644
--- a/src/testdir/test_largefile.vim
+++ b/src/testdir/test_largefile.vim
@@ -22,9 +22,13 @@ func Test_largefile()
normal 50%
normal gg
w
- " Check if the file size is larger than 2^31 - 1 bytes.
- " Note that getfsize() returns -2 if a Number is 32 bits.
+ " Check if the file size is 4,000,000,000 bytes.
let fsize=getfsize(fname)
- call assert_true(fsize > 2147483647 || fsize == -2)
- "call delete(fname)
+ if has('num64')
+ call assert_true(fsize == 4000000000)
+ else
+ " getfsize() returns -2 if a Number is 32 bits.
+ call assert_true(fsize == -2)
+ endif
+ call delete(fname)
endfunc
diff --git a/src/version.c b/src/version.c
index 00b88943c..1613a7222 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1978,
+/**/
1977,
/**/
1976,