Hi list.

There are tests failed on DOS/Windows environment.
I have fixed two of them.
Please check attached patches.


test50: Short name seems depending on OS version.
On my Win7, "c:/x.x.y" has short name "c:/XX9B80~1.Y", it will not be matched.
So I made it flexible.


test77: failed when "cksum" available (MinGW or Cygwin).


Best.

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


# HG changeset patch
# Parent fd270c3511646ced68a1746406677fa44b6c2ae3
diff -r fd270c351164 -r 357de3c47ce6 src/testdir/test50.in
--- a/src/testdir/test50.in	Tue Jun 18 08:17:50 2013 +0900
+++ b/src/testdir/test50.in	Tue Jun 18 08:49:30 2013 +0900
@@ -33,7 +33,7 @@
 	" This could change for CygWin to //cygdrive/c
 	let dir1='c:/x.x.y'
 	if filereadable(dir1) || isdirectory(dir1)
-		call confirm( "'".dir1."' exists, cannot run test" )
+		echo "FATAL: '".dir1."' exists, cannot run test"
 		return
 	endif
 	let file1=dir1.'/zz.y.txt'
@@ -41,13 +41,18 @@
 	let dir2=dir1.'/VimIsTheGreatestSinceSlicedBread'
 	let file2=dir2.'/z.txt'
 	let nofile2=dir2.'/zz.txt'
-	let resdir1='c:/XX2235~1.Y'
+	call MakeDir( dir1 )
+	let resdir1 = substitute(fnamemodify(dir1, ':p:8'), '\\$', '', '')
+	if resdir1 !~ '\V\^c:/XX\x\x\x\x~1.Y\$'
+		echo "FATAL: unexpected short name: " . resdir1
+		echo "INFO: please report your OS to vim-dev"
+		return
+	endif
 	let resfile1=resdir1.'/ZZY~1.TXT'
 	let resnofile1=resdir1.'/z.y.txt'
 	let resdir2=resdir1.'/VIMIST~1'
 	let resfile2=resdir2.'/z.txt'
 	let resnofile2=resdir2.'/zz.txt'
-	call MakeDir( dir1 )
 	call MakeDir( dir2 )
 	call MakeFile( file1 )
 	call MakeFile( file2 )
# HG changeset patch
# Parent 51018ee51cc10a21b2ec0e0ca804476a0d5209cb
diff -r 51018ee51cc1 -r eb5084aff8e6 src/testdir/test77.in
--- a/src/testdir/test77.in	Tue Jun 18 08:04:56 2013 +0900
+++ b/src/testdir/test77.in	Tue Jun 18 08:08:43 2013 +0900
@@ -23,6 +23,7 @@
 :w! Xtest
 :r !cksum Xtest
 :s/\s/ /g
+:set fileformat&
 :.w! test.out
 :qa!
 ENDTEST

Reply via email to