From 3cc7b27383c4f5814984a00c995182e632ca6de8 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Wed, 17 Jun 2015 17:02:40 -0700 Subject: [PATCH] go/internal/gccgoimporter: enable tests on Plan9 Work-around issue #11265 and re-enable tests for Plan9. Change-Id: I3aabb674a149b8eb936f948dd4cda5fd81454646 Reviewed-on: https://go-review.googlesource.com/11194 Run-TryBot: Robert Griesemer Reviewed-by: Ian Lance Taylor --- src/go/internal/gccgoimporter/gccgoinstallation_test.go | 4 ---- src/go/internal/gccgoimporter/importer.go | 6 ++++++ src/go/internal/gccgoimporter/importer_test.go | 4 ---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/go/internal/gccgoimporter/gccgoinstallation_test.go b/src/go/internal/gccgoimporter/gccgoinstallation_test.go index d9adcecab7c..ef293edcbec 100644 --- a/src/go/internal/gccgoimporter/gccgoinstallation_test.go +++ b/src/go/internal/gccgoimporter/gccgoinstallation_test.go @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Exclude plan9 for now due to test failure with TestGoxImporter. -// TODO(gri) eliminate this build tag -// +build !plan9 - package gccgoimporter import ( diff --git a/src/go/internal/gccgoimporter/importer.go b/src/go/internal/gccgoimporter/importer.go index feb9849eefe..aa0d01afdf3 100644 --- a/src/go/internal/gccgoimporter/importer.go +++ b/src/go/internal/gccgoimporter/importer.go @@ -88,6 +88,12 @@ func openExportFile(fpath string) (reader io.ReadSeeker, closer io.Closer, err e if err != nil { return } + // reset to offset 0 - needed on Plan 9 (see issue #11265) + // TODO: remove once issue #11265 has been resolved. + _, err = f.Seek(0, 0) + if err != nil { + return + } var elfreader io.ReaderAt switch string(magic[:]) { diff --git a/src/go/internal/gccgoimporter/importer_test.go b/src/go/internal/gccgoimporter/importer_test.go index ce0dfb99efa..4fa01c762c9 100644 --- a/src/go/internal/gccgoimporter/importer_test.go +++ b/src/go/internal/gccgoimporter/importer_test.go @@ -2,10 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Exclude plan9 for now due to test failure with TestGoxImporter. -// TODO(gri) eliminate this build tag -// +build !plan9 - package gccgoimporter import (