diff options
| -rw-r--r-- | src/testdir/test_random.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/testdir/test_random.vim b/src/testdir/test_random.vim index fdfaea257..be8473f29 100644 --- a/src/testdir/test_random.vim +++ b/src/testdir/test_random.vim @@ -12,17 +12,9 @@ func Test_Rand() call assert_equal(2658065534, rand(r)) call assert_equal(3104308804, rand(r)) - call test_settime(12341234) let s = srand() - if !has('win32') && filereadable('/dev/urandom') - " using /dev/urandom - call assert_notequal(s, srand()) - else - " using time() - call assert_equal(s, srand()) - call test_settime(12341235) - call assert_notequal(s, srand()) - endif + " using /dev/urandom or used time, result is different each time + call assert_notequal(s, srand()) call test_srand_seed(123456789) call assert_equal(4284103975, rand()) @@ -37,8 +29,6 @@ func Test_Rand() call assert_fails('echo rand([1, [2], 3, 4])', 'E730:') call assert_fails('echo rand([1, 2, [3], 4])', 'E730:') call assert_fails('echo rand([1, 2, 3, [4]])', 'E730:') - - call test_settime(0) endfunc func Test_issue_5587() diff --git a/src/version.c b/src/version.c index 3dbc0a0a5..4ba888e0f 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1017, +/**/ 1016, /**/ 1015, |