aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Brainman <alex.brainman@gmail.com>2015-09-01 22:25:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-09-01 22:25:53 +0000
commit4bc6e2cb68d6e74cebc1873a5fd21064e0c536dc (patch)
treed39e0cba71c8570b01bdc9c221c36cc4fc477db9
parent16af36c62b4185ad84594e7fbffac8fd3817bcd0 (diff)
parentf25d0131d475904250c3a8d0005799a96a8e5538 (diff)
downloadtools-4bc6e2cb68d6e74cebc1873a5fd21064e0c536dc.tar.gz
go/loader: make TestLoad_ParseError_AllowErrors pass on windows
automerge: f25d013 * commit 'f25d0131d475904250c3a8d0005799a96a8e5538': go/loader: make TestLoad_ParseError_AllowErrors pass on windows
-rw-r--r--go/loader/loader_test.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/go/loader/loader_test.go b/go/loader/loader_test.go
index 0b42e39..eb06f04 100644
--- a/go/loader/loader_test.go
+++ b/go/loader/loader_test.go
@@ -7,6 +7,7 @@ package loader_test
import (
"fmt"
"go/build"
+ "path/filepath"
"reflect"
"sort"
"strings"
@@ -221,8 +222,9 @@ func TestLoad_ParseError_AllowErrors(t *testing.T) {
if len(badpkg.Files) != 1 {
t.Errorf("badpkg has %d files, want 1", len(badpkg.Files))
}
- wantErr := "testdata/badpkgdecl.go:1:34: expected 'package', found 'EOF'"
+ wantErr := filepath.Join("testdata", "badpkgdecl.go") + ":1:34: expected 'package', found 'EOF'"
if !hasError(badpkg.Errors, wantErr) {
+
t.Errorf("badpkg.Errors = %v, want %s", badpkg.Errors, wantErr)
}
}