From 067bb443af6b44cb026ab182a26d157dbd1b2dd6 Mon Sep 17 00:00:00 2001 From: Katie Hockman Date: Fri, 28 Sep 2018 13:50:57 -0400 Subject: [PATCH] compress: move benchmark text from src/testdata to src/compress/testdata 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 TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- misc/nacl/testzip.proto | 2 -- src/compress/flate/deflate_test.go | 4 ++-- src/compress/flate/reader_test.go | 2 +- src/{ => compress}/testdata/Isaac.Newton-Opticks.txt | 0 src/net/sendfile_test.go | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) rename src/{ => compress}/testdata/Isaac.Newton-Opticks.txt (100%) diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto index 1e9279e4e0..f15a2ab224 100644 --- a/misc/nacl/testzip.proto +++ b/misc/nacl/testzip.proto @@ -177,8 +177,6 @@ go src=.. strconv testdata + - testdata - + text template testdata diff --git a/src/compress/flate/deflate_test.go b/src/compress/flate/deflate_test.go index 831be2198c..46d917c01e 100644 --- a/src/compress/flate/deflate_test.go +++ b/src/compress/flate/deflate_test.go @@ -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}, }, @@ -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) } diff --git a/src/compress/flate/reader_test.go b/src/compress/flate/reader_test.go index 9d2943a540..e1c3dff11b 100644 --- a/src/compress/flate/reader_test.go +++ b/src/compress/flate/reader_test.go @@ -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) { diff --git a/src/testdata/Isaac.Newton-Opticks.txt b/src/compress/testdata/Isaac.Newton-Opticks.txt similarity index 100% rename from src/testdata/Isaac.Newton-Opticks.txt rename to src/compress/testdata/Isaac.Newton-Opticks.txt diff --git a/src/net/sendfile_test.go b/src/net/sendfile_test.go index f133744a66..7077cc36e8 100644 --- a/src/net/sendfile_test.go +++ b/src/net/sendfile_test.go @@ -17,7 +17,7 @@ import ( ) const ( - newton = "../testdata/Isaac.Newton-Opticks.txt" + newton = "../compress/testdata/Isaac.Newton-Opticks.txt" newtonLen = 567198 newtonSHA256 = "d4a9ac22462b35e7821a4f2706c211093da678620a8f9997989ee7cf8d507bbd" ) -- 2.48.1