diff options
author | Ondřej Surý <ondrej@sury.org> | 2011-04-26 09:55:32 +0200 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2011-04-26 09:55:32 +0200 |
commit | 7b15ed9ef455b6b66c6b376898a88aef5d6a9970 (patch) | |
tree | 3ef530baa80cdf29436ba981f5783be6b4d2202b /src/pkg/image/png | |
parent | 50104cc32a498f7517a51c8dc93106c51c7a54b4 (diff) | |
download | golang-7b15ed9ef455b6b66c6b376898a88aef5d6a9970.tar.gz |
Imported Upstream version 2011.04.13upstream/2011.04.13
Diffstat (limited to 'src/pkg/image/png')
-rw-r--r-- | src/pkg/image/png/reader_test.go | 16 | ||||
-rw-r--r-- | src/pkg/image/png/writer_test.go | 6 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/pkg/image/png/reader_test.go b/src/pkg/image/png/reader_test.go index 8314a8338..efa6336d7 100644 --- a/src/pkg/image/png/reader_test.go +++ b/src/pkg/image/png/reader_test.go @@ -34,8 +34,14 @@ var filenames = []string{ "basn6a16", } +var filenamesShort = []string{ + "basn0g01", + "basn0g04-31", + "basn6a16", +} + func readPng(filename string) (image.Image, os.Error) { - f, err := os.Open(filename, os.O_RDONLY, 0444) + f, err := os.Open(filename) if err != nil { return nil, err } @@ -157,7 +163,11 @@ func sng(w io.WriteCloser, filename string, png image.Image) { } func TestReader(t *testing.T) { - for _, fn := range filenames { + names := filenames + if testing.Short() { + names = filenamesShort + } + for _, fn := range names { // Read the .png file. img, err := readPng("testdata/pngsuite/" + fn + ".png") if err != nil { @@ -181,7 +191,7 @@ func TestReader(t *testing.T) { defer piper.Close() // Read the .sng file. - sf, err := os.Open("testdata/pngsuite/"+fn+".sng", os.O_RDONLY, 0444) + sf, err := os.Open("testdata/pngsuite/" + fn + ".sng") if err != nil { t.Error(fn, err) continue diff --git a/src/pkg/image/png/writer_test.go b/src/pkg/image/png/writer_test.go index f218a5564..4d9929f31 100644 --- a/src/pkg/image/png/writer_test.go +++ b/src/pkg/image/png/writer_test.go @@ -32,7 +32,11 @@ func diff(m0, m1 image.Image) os.Error { func TestWriter(t *testing.T) { // The filenames variable is declared in reader_test.go. - for _, fn := range filenames { + names := filenames + if testing.Short() { + names = filenamesShort + } + for _, fn := range names { qfn := "testdata/pngsuite/" + fn + ".png" // Read the image. m0, err := readPng(qfn) |