Skip to content

Commit

Permalink
compress: move benchmark text from src/testdata to src/compress/testdata
Browse files Browse the repository at this point in the history
This text is used mainly for benchmark compression testing, and in one
net test. The text was prevoiusly in a src/testdata directory, but since
that directory would only include one file, the text is moved to the
existing src/compression/testdata directory.

This does not cause any change to the benchmark results.

Updates #27151

Change-Id: I38ab5089dfe744189a970947d15be50ef1d48517
Reviewed-on: https://go-review.googlesource.com/138495
Run-TryBot: Katie Hockman <katie@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
  • Loading branch information
katiehockman committed Sep 28, 2018
1 parent 01e6cfc commit 067bb44
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions misc/nacl/testzip.proto
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,6 @@ go src=..
strconv
testdata
+
testdata
+
text
template
testdata
Expand Down
4 changes: 2 additions & 2 deletions src/compress/flate/deflate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ var deflateInflateStringTests = []deflateInflateStringTest{
[...]int{100018, 50650, 50960, 51150, 50930, 50790, 50790, 50790, 50790, 50790, 43683},
},
{
"../../testdata/Isaac.Newton-Opticks.txt",
"../testdata/Isaac.Newton-Opticks.txt",
"Isaac.Newton-Opticks",
[...]int{567248, 218338, 198211, 193152, 181100, 175427, 175427, 173597, 173422, 173422, 325240},
},
Expand Down Expand Up @@ -654,7 +654,7 @@ func (w *failWriter) Write(b []byte) (int, error) {

func TestWriterPersistentError(t *testing.T) {
t.Parallel()
d, err := ioutil.ReadFile("../../testdata/Isaac.Newton-Opticks.txt")
d, err := ioutil.ReadFile("../testdata/Isaac.Newton-Opticks.txt")
if err != nil {
t.Fatalf("ReadFile: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion src/compress/flate/reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var suites = []struct{ name, file string }{
// reasonably compressible.
{"Digits", "../testdata/e.txt"},
// Newton is Isaac Newtons's educational text on Opticks.
{"Newton", "../../testdata/Isaac.Newton-Opticks.txt"},
{"Newton", "../testdata/Isaac.Newton-Opticks.txt"},
}

func BenchmarkDecode(b *testing.B) {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/net/sendfile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
)

const (
newton = "../testdata/Isaac.Newton-Opticks.txt"
newton = "../compress/testdata/Isaac.Newton-Opticks.txt"
newtonLen = 567198
newtonSHA256 = "d4a9ac22462b35e7821a4f2706c211093da678620a8f9997989ee7cf8d507bbd"
)
Expand Down

0 comments on commit 067bb44

Please sign in to comment.