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 :(.
diff --git a/.bzrignore b/.bzrignore
index 340cde7..e39772e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,2 +1,3 @@
_*
[856].out
+[856].out.exe
diff --git a/gocheck.go b/gocheck.go
index c04ab2b..e26e7cb 100644
--- a/gocheck.go
+++ b/gocheck.go
@@ -293,10 +293,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
@@ -865,3 +871,4 @@
return fmt.Sprintf("%s%s: %s: %s%s", prefix, label, niceFuncPath(pc),
niceFuncName(pc), suffix)
}
+
