Commit 43cd9070 authored by Katie Hockman's avatar Katie Hockman

Revert "compress: move benchmark text from src/testdata to src/compress/testdata"

This reverts commit 067bb443.

Reason for revert:
Failing Darwin-arm builds because that testing environment does not access testdata
from sibling directories. A future change will likely be made to move this testdata
out of src/testdata to create a solution that doesn't require the single-file directory.

Updates #27151

Change-Id: I8dbf5dd9512c94a605ee749ff4655cb00b0de686
Reviewed-on: https://go-review.googlesource.com/138737Reviewed-by: default avatarDmitri Shuralyov <dmitshur@golang.org>
parent 0b994a90
...@@ -177,6 +177,8 @@ go src=.. ...@@ -177,6 +177,8 @@ go src=..
strconv strconv
testdata testdata
+ +
testdata
+
text text
template template
testdata testdata
......
...@@ -371,7 +371,7 @@ var deflateInflateStringTests = []deflateInflateStringTest{ ...@@ -371,7 +371,7 @@ var deflateInflateStringTests = []deflateInflateStringTest{
[...]int{100018, 50650, 50960, 51150, 50930, 50790, 50790, 50790, 50790, 50790, 43683}, [...]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", "Isaac.Newton-Opticks",
[...]int{567248, 218338, 198211, 193152, 181100, 175427, 175427, 173597, 173422, 173422, 325240}, [...]int{567248, 218338, 198211, 193152, 181100, 175427, 175427, 173597, 173422, 173422, 325240},
}, },
...@@ -654,7 +654,7 @@ func (w *failWriter) Write(b []byte) (int, error) { ...@@ -654,7 +654,7 @@ func (w *failWriter) Write(b []byte) (int, error) {
func TestWriterPersistentError(t *testing.T) { func TestWriterPersistentError(t *testing.T) {
t.Parallel() t.Parallel()
d, err := ioutil.ReadFile("../testdata/Isaac.Newton-Opticks.txt") d, err := ioutil.ReadFile("../../testdata/Isaac.Newton-Opticks.txt")
if err != nil { if err != nil {
t.Fatalf("ReadFile: %v", err) t.Fatalf("ReadFile: %v", err)
} }
......
...@@ -28,7 +28,7 @@ var suites = []struct{ name, file string }{ ...@@ -28,7 +28,7 @@ var suites = []struct{ name, file string }{
// reasonably compressible. // reasonably compressible.
{"Digits", "../testdata/e.txt"}, {"Digits", "../testdata/e.txt"},
// Newton is Isaac Newtons's educational text on Opticks. // 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) { func BenchmarkDecode(b *testing.B) {
......
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
) )
const ( const (
newton = "../compress/testdata/Isaac.Newton-Opticks.txt" newton = "../testdata/Isaac.Newton-Opticks.txt"
newtonLen = 567198 newtonLen = 567198
newtonSHA256 = "d4a9ac22462b35e7821a4f2706c211093da678620a8f9997989ee7cf8d507bbd" newtonSHA256 = "d4a9ac22462b35e7821a4f2706c211093da678620a8f9997989ee7cf8d507bbd"
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment