From 519725bb3c075ee2462c929f5997cb068e18466a Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 26 Mar 2012 16:50:58 +0200
Subject: Imported Upstream version 2012.03.22

---
 src/cmd/api/testdata/src/pkg/p1/golden.txt | 4 +++-
 src/cmd/api/testdata/src/pkg/p1/p1.go      | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/cmd/api/testdata')

diff --git a/src/cmd/api/testdata/src/pkg/p1/golden.txt b/src/cmd/api/testdata/src/pkg/p1/golden.txt
index 3a1b3f535..e334e5776 100644
--- a/src/cmd/api/testdata/src/pkg/p1/golden.txt
+++ b/src/cmd/api/testdata/src/pkg/p1/golden.txt
@@ -58,14 +58,16 @@ pkg p1, type T struct
 pkg p1, type TPtrExported struct
 pkg p1, type TPtrExported struct, embedded *Embedded
 pkg p1, type TPtrUnexported struct
+pkg p1, var ByteConv []byte
 pkg p1, var ChecksumError error
 pkg p1, var SIPtr *SI
 pkg p1, var SIPtr2 *SI
 pkg p1, var SIVal SI
+pkg p1, var StrConv string
 pkg p1, var V string
-pkg p1, var VError Error
 pkg p1, var V1 uint64
 pkg p1, var V2 p2.Twoer
+pkg p1, var VError Error
 pkg p1, var X I
 pkg p1, var X int64
 pkg p1, var Y int
diff --git a/src/cmd/api/testdata/src/pkg/p1/p1.go b/src/cmd/api/testdata/src/pkg/p1/p1.go
index 9d2afa913..d965bb75e 100644
--- a/src/cmd/api/testdata/src/pkg/p1/p1.go
+++ b/src/cmd/api/testdata/src/pkg/p1/p1.go
@@ -27,6 +27,12 @@ var (
 	V2     = ptwo.G()
 )
 
+// Variables with conversions:
+var (
+	StrConv  = string("foo")
+	ByteConv = []byte("foo")
+)
+
 var ChecksumError = ptwo.NewError("gzip checksum error")
 
 const B = 2
-- 
cgit v1.2.3