From: Andrew Gerrand <adg@golang.org>
Date: Tue, 11 Feb 2014 05:27:14 +0000 (+1100)
Subject: archive/zip: use correct test, fix 32-bit build
X-Git-Tag: go1.3beta1~773
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c4b279ba5ac2226a36434a6d715f2d7713e987e1;p=gostls13.git

archive/zip: use correct test, fix 32-bit build

LGTM=dsymonds
R=dsymonds
CC=golang-codereviews
https://golang.org/cl/61070047
---

diff --git a/src/pkg/archive/zip/reader_test.go b/src/pkg/archive/zip/reader_test.go
index 971fbedb5c..5652f3a500 100644
--- a/src/pkg/archive/zip/reader_test.go
+++ b/src/pkg/archive/zip/reader_test.go
@@ -371,11 +371,11 @@ func readTestFile(t *testing.T, zt ZipTest, ft ZipTestFile, f *File) {
 	}
 	r.Close()
 
-	size := int(f.UncompressedSize)
-	if size == 1<<32-1 {
-		size = int(f.UncompressedSize64)
+	size := uint64(f.UncompressedSize)
+	if size == uint32max {
+		size = f.UncompressedSize64
 	}
-	if g := b.Len(); g != size {
+	if g := uint64(b.Len()); g != size {
 		t.Errorf("%v: read %v bytes but f.UncompressedSize == %v", f.Name, g, size)
 	}