Merge lp:~jameinel/gocheck/win32-tests into lp:gocheck

[John A Meinel]

Transform '\' separated paths to '/' so that the tests pass on Windows.

This fixes a bunch of failing tests on Windows.

Specifically, a lot of tests were asserting something like:

FAIL: filename.go ...

While on Windows, the full paths are given:

FAIL: C:/dev/go/gocheck/filename.go

I dug into it, and it turns out that nicePath was comparing
function.FileLine() to os.Getwd(). However, function.FileLine() returns
'C:/path/to/foo' while 'os.Getwd()' returns 'C:\path\to\foo'.

I also did one more quick change, which was to always append the trailing '/'.
That way we don't have to do that on every call to nicePath() (and I checked
that only nicePath uses initWD).

At the moment, there are only 2 remaining tests failing. Both because the
failure messages don't include the module name. This is with golang r58. So it
is possible that golang changed something (so it needs to be fixed anyway), or
it is possible it just works differently on Windows :(.

[John A Meinel (jameinel)]

The regexp thing seems to have been triggered by this commit:
http://code.google.com/p/go/source/detail?spec=svn67b160cd5fa47f3703c503e7fd65c23e9213d2a9&r=fc5e8036769a1fec534911f3720de426755670ef

I'm not sure why a commit from June 16th isn't in r58, but whatever, I'll survive. Annoying to have the tests that tightly tied to the exact version of go you are running with.

[Gustavo Niemeyer (niemeyer)]

Hey John,

I apologize it took me a while to get to this, but I'd like to get it merged.

Do you have any other recent changes, or have you been using this as-is?

[John A Meinel (jameinel)]

That was all I needed to change at the time, I haven't been playing with go much for the last month or so.

[Gustavo Niemeyer (niemeyer)]

Alright.. I'll hope for the best and submit this.

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

This fixes a bunch of failing tests on Windows.

Specifically, a lot of tests were asserting something like:

FAIL: filename.go ...

While on Windows, the full paths are given:

FAIL: C:/dev/go/gocheck/filename.go

I dug into it, and it turns out that nicePath was comparing
function.FileLine() to os.Getwd(). However, function.FileLine() returns
'C:/path/to/foo' while 'os.Getwd()' returns 'C:\path\to\foo'.

I also did one more quick change, which was to always append the trailing '/'.
That way we don't have to do that on every call to nicePath() (and I checked
that only nicePath uses initWD).

At the moment, there are only 2 remaining tests failing. Both because the
failure messages don't include the module name. This is with golang r58. So it
is possible that golang changed something (so it needs to be fixed anyway), or
it is possible it just works differently on Windows :(.

=== modified file '.bzrignore'
--- .bzrignore	2010-11-06 17:09:32 +0000
+++ .bzrignore	2011-07-04 13:48:36 +0000
@@ -1,2 +1,3 @@
 _*
 [856].out
+[856].out.exe

=== modified file 'gocheck.go'
--- gocheck.go	2011-04-28 11:02:15 +0000
+++ gocheck.go	2011-07-04 13:48:36 +0000
@@ -260,10 +260,16 @@
 
 var initWD, initWDErr = os.Getwd()
 
+func init() {
+	if initWDErr == nil {
+		initWD = strings.Replace(initWD, "\\", "/", -1) + "/"
+	}
+}
+
 func nicePath(path string) string {
 	if initWDErr == nil {
-		if strings.HasPrefix(path, initWD+"/") {
-			return path[len(initWD)+1:]
+		if strings.HasPrefix(path, initWD) {
+			return path[len(initWD):]
 		}
 	}
 	return path
@@ -796,3 +802,4 @@
 	return fmt.Sprintf("%s%s: %s: %s%s", prefix, label, niceFuncPath(pc),
 		niceFuncName(pc), suffix)
 }
+