Skip to content

Commit 43cd907

Browse files
committed
Revert "compress: move benchmark text from src/testdata to src/compress/testdata"
This reverts commit 067bb44. 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/138737 Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
1 parent 0b994a9 commit 43cd907

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

misc/nacl/testzip.proto

+2
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ go src=..
177177
strconv
178178
testdata
179179
+
180+
testdata
181+
+
180182
text
181183
template
182184
testdata

src/compress/flate/deflate_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ var deflateInflateStringTests = []deflateInflateStringTest{
371371
[...]int{100018, 50650, 50960, 51150, 50930, 50790, 50790, 50790, 50790, 50790, 43683},
372372
},
373373
{
374-
"../testdata/Isaac.Newton-Opticks.txt",
374+
"../../testdata/Isaac.Newton-Opticks.txt",
375375
"Isaac.Newton-Opticks",
376376
[...]int{567248, 218338, 198211, 193152, 181100, 175427, 175427, 173597, 173422, 173422, 325240},
377377
},
@@ -654,7 +654,7 @@ func (w *failWriter) Write(b []byte) (int, error) {
654654

655655
func TestWriterPersistentError(t *testing.T) {
656656
t.Parallel()
657-
d, err := ioutil.ReadFile("../testdata/Isaac.Newton-Opticks.txt")
657+
d, err := ioutil.ReadFile("../../testdata/Isaac.Newton-Opticks.txt")
658658
if err != nil {
659659
t.Fatalf("ReadFile: %v", err)
660660
}

src/compress/flate/reader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var suites = []struct{ name, file string }{
2828
// reasonably compressible.
2929
{"Digits", "../testdata/e.txt"},
3030
// Newton is Isaac Newtons's educational text on Opticks.
31-
{"Newton", "../testdata/Isaac.Newton-Opticks.txt"},
31+
{"Newton", "../../testdata/Isaac.Newton-Opticks.txt"},
3232
}
3333

3434
func BenchmarkDecode(b *testing.B) {

src/net/sendfile_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
const (
20-
newton = "../compress/testdata/Isaac.Newton-Opticks.txt"
20+
newton = "../testdata/Isaac.Newton-Opticks.txt"
2121
newtonLen = 567198
2222
newtonSHA256 = "d4a9ac22462b35e7821a4f2706c211093da678620a8f9997989ee7cf8d507bbd"
2323
)

0 commit comments

Comments
 (0)