diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-03 02:17:34 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-03 02:17:34 +0000 |
| commit | 6692ad1d1b2710fc619d04aad2ae0668cc59f4db (patch) | |
| tree | 7f76eff391f37fe6467ff4ffbc0c582c9959ea30 /libgo/go/image/png/reader_test.go | |
| parent | 96265ae6967d08ca35d36e87b7588c0c9e6e5cca (diff) | |
| download | gcc-6692ad1d1b2710fc619d04aad2ae0668cc59f4db.tar.gz | |
libgo: Update to weekly.2011-11-02.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181964 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/image/png/reader_test.go')
| -rw-r--r-- | libgo/go/image/png/reader_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgo/go/image/png/reader_test.go b/libgo/go/image/png/reader_test.go index 48d06130e37..7eb1fc21a89 100644 --- a/libgo/go/image/png/reader_test.go +++ b/libgo/go/image/png/reader_test.go @@ -43,7 +43,7 @@ var filenamesShort = []string{ "basn6a16", } -func readPNG(filename string) (image.Image, os.Error) { +func readPNG(filename string) (image.Image, error) { f, err := os.Open(filename) if err != nil { return nil, err @@ -223,7 +223,7 @@ func TestReader(t *testing.T) { for { ps, perr := pb.ReadString('\n') ss, serr := sb.ReadString('\n') - if perr == os.EOF && serr == os.EOF { + if perr == io.EOF && serr == io.EOF { break } if perr != nil { @@ -259,7 +259,7 @@ func TestReaderError(t *testing.T) { t.Errorf("decoding %s: missing error", tt.file) continue } - if !strings.Contains(err.String(), tt.err) { + if !strings.Contains(err.Error(), tt.err) { t.Errorf("decoding %s: %s, want %s", tt.file, err, tt.err) } if img != nil { |