close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go/gcimporter15: don't run 1.7-specific test under 1.8 (fix build) 

TBR=adonovan

Change-Id: I310ff6e51d681b2e5c8288e73870ce7d68e45518
Reviewed-on: https://go-review.googlesource.com/27208
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Robert Griesemer 2016-08-16 22:08:34 -07:00
parent 491cbb1158
commit 1cf0a337cd
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
go/gcimporter15/gcimporter17_test.go
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build go1.7 // +build go1.7,!go1.8
package gcimporter package gcimporter
@ -15,7 +15,6 @@ import (
"testing" "testing"
) )
// TODO(gri) Remove this function once we switched to new export format by default.
func compileNewExport(t *testing.T, dirname, filename string) string { func compileNewExport(t *testing.T, dirname, filename string) string {
/* testenv. */ MustHaveGoBuild(t) /* testenv. */ MustHaveGoBuild(t)
cmd := exec.Command("go", "tool", "compile", "-newexport", filename) cmd := exec.Command("go", "tool", "compile", "-newexport", filename)
@ -29,8 +28,6 @@ func compileNewExport(t *testing.T, dirname, filename string) string {
return filepath.Join(dirname, filename[:len(filename)-2]+"o") return filepath.Join(dirname, filename[:len(filename)-2]+"o")
} }
// TODO(gri) Remove this function once we switched to new export format by default
// (and update the comment and want list in TestImportTestdata).
func TestImportTestdataNewExport(t *testing.T) { func TestImportTestdataNewExport(t *testing.T) {
// This package only handles gc export data. // This package only handles gc export data.
if runtime.Compiler != "gc" { if runtime.Compiler != "gc" {