From: Shenghou Ma <minux@golang.org>
Date: Wed, 8 Apr 2015 05:32:45 +0000 (-0400)
Subject: cmd/api: re-enable TestGolden on nacl
X-Git-Tag: go1.5beta1~1261
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=84b690fee17642d69eaac13f6a4f6c2cac13d5b4;p=gostls13.git

cmd/api: re-enable TestGolden on nacl

Fixes #10369.

Change-Id: If0a6d2b33c6862c9f7f862bdc997f2204072c6dc
Reviewed-on: https://go-review.googlesource.com/8620
Run-TryBot: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
index b2e866c1e8..1c013c1784 100644
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@ -10,6 +10,9 @@ usr	src=../misc/nacl/testdata
 go	src=..
 	src
 		cmd
+			api
+				testdata
+					+
 			asm
 				internal
 					asm
diff --git a/src/cmd/api/goapi_test.go b/src/cmd/api/goapi_test.go
index 361c294bc3..9f5b0c8bb4 100644
--- a/src/cmd/api/goapi_test.go
+++ b/src/cmd/api/goapi_test.go
@@ -13,7 +13,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"strings"
 	"testing"
@@ -24,13 +23,6 @@ var (
 )
 
 func TestGolden(t *testing.T) {
-	// test fails on NaCl - skip for now
-	// (goapi_test.go:35: open testdata/src/pkg: No such file or directory)
-	// TODO(gri) fix this ASAP
-	if runtime.GOOS == "nacl" {
-		return
-	}
-
 	td, err := os.Open("testdata/src/pkg")
 	if err != nil {
 		t.Fatal(err)