aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Brainman <alex.brainman@gmail.com>2015-09-01 22:25:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-09-01 22:25:40 +0000
commit9f9719d1a4555e788e430bf9b2375d3842d5b24c (patch)
treedbfb9e5c2ac7514d5f1532c825ef806ebed00eaf
parent79f427d5881a306a93b6f59c7eb4250f35e871d5 (diff)
parent7ba2a8c9a970818574cbc70d8144c9fefefcc43f (diff)
downloadtools-9f9719d1a4555e788e430bf9b2375d3842d5b24c.tar.gz
cmd/vet: make TestTags pass on windows
automerge: 7ba2a8c * commit '7ba2a8c9a970818574cbc70d8144c9fefefcc43f': cmd/vet: make TestTags pass on windows
-rw-r--r--cmd/vet/vet_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/vet/vet_test.go b/cmd/vet/vet_test.go
index 0027a1f..25ee687 100644
--- a/cmd/vet/vet_test.go
+++ b/cmd/vet/vet_test.go
@@ -15,7 +15,7 @@ import (
const (
dataDir = "testdata"
- binary = "testvet"
+ binary = "testvet.exe"
)
// Run this shell script, but do it in Go so it can be run by "go test".
@@ -93,10 +93,10 @@ func TestTags(t *testing.T) {
t.Fatal(err)
}
// file1 has testtag and file2 has !testtag.
- if !bytes.Contains(output, []byte("tagtest/file1.go")) {
+ if !bytes.Contains(output, []byte(filepath.Join("tagtest", "file1.go"))) {
t.Error("file1 was excluded, should be included")
}
- if bytes.Contains(output, []byte("tagtest/file2.go")) {
+ if bytes.Contains(output, []byte(filepath.Join("tagtest", "file2.go"))) {
t.Error("file2 was included, should be excluded")
}
}