Skip to content

Commit 0c5ad6e

Browse files
committed
updated for version 7.3.1250
Problem: Python tests fail on MS-Windows. Solution: Change backslashes to slashes. (Taro Muraoka)
1 parent 398f555 commit 0c5ad6e

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/testdir/test86.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,12 +1221,12 @@ sys.path.append(os.path.join(os.getcwd(), 'python_after'))
12211221
vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
12221222
l = []
12231223
def callback(path):
1224-
l.append(path[-len('/testdir'):])
1224+
l.append(path[-len('/testdir'):].replace(os.path.sep, '/'))
12251225
vim.foreach_rtp(callback)
12261226
cb.append(repr(l))
12271227
del l
12281228
def callback(path):
1229-
return path[-len('/testdir'):]
1229+
return path[-len('/testdir'):].replace(os.path.sep, '/')
12301230
cb.append(repr(vim.foreach_rtp(callback)))
12311231
del callback
12321232
from module import dir as d
@@ -1239,9 +1239,9 @@ cb.append(after.dir)
12391239
import topmodule as tm
12401240
import topmodule.submodule as tms
12411241
import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
1242-
cb.append(tm.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/__init__.py'):])
1243-
cb.append(tms.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/__init__.py'):])
1244-
cb.append(tmsss.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
1242+
cb.append(tm.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/__init__.py'):])
1243+
cb.append(tms.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/__init__.py'):])
1244+
cb.append(tmsss.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
12451245
del before
12461246
del after
12471247
del d

src/testdir/test87.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,9 +1188,9 @@ cb.append(after.dir)
11881188
import topmodule as tm
11891189
import topmodule.submodule as tms
11901190
import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
1191-
cb.append(tm.__file__[-len('modulex/topmodule/__init__.py'):])
1192-
cb.append(tms.__file__[-len('modulex/topmodule/submodule/__init__.py'):])
1193-
cb.append(tmsss.__file__[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
1191+
cb.append(tm.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/__init__.py'):])
1192+
cb.append(tms.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/__init__.py'):])
1193+
cb.append(tmsss.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
11941194
del before
11951195
del after
11961196
del d

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ static char *(features[]) =
728728

729729
static int included_patches[] =
730730
{ /* Add new patch number below this line */
731+
/**/
732+
1250,
731733
/**/
732734
1249,
733735
/**/

0 commit comments

Comments
 (0)