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

This reverts commit 067bb443af6b44cb026ab182a26d157dbd1b2dd6.

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>

diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
index f15a2ab224636afb3745bdecbd49167389be2767..1e9279e4e0c136830c2004ca21641cc750479115 100644 (file)
--- a/misc/nacl/testzip.proto
+++ b/misc/nacl/testzip.proto
@@ -177,6 +177,8 @@ 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 46d917c01ec82b80863fc64a8089d6b238850685..831be2198cadbef19c3904eebb401fec2654911d 100644 (file)
--- 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 e1c3dff11ba88aaa8cc21e627788b9db27e92d6b..9d2943a54077cc5262709f69817f6d5fddaf8a3b 100644 (file)
--- 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/net/sendfile_test.go b/src/net/sendfile_test.go
index 7077cc36e80807f31fe3de3bbe83915f17b8b84a..f133744a6654547dfc8b4994a5fb048fc581da91 100644 (file)
--- a/src/net/sendfile_test.go
+++ b/src/net/sendfile_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 const (
-       newton       = "../compress/testdata/Isaac.Newton-Opticks.txt"
+       newton       = "../testdata/Isaac.Newton-Opticks.txt"
        newtonLen    = 567198
        newtonSHA256 = "d4a9ac22462b35e7821a4f2706c211093da678620a8f9997989ee7cf8d507bbd"
 )

diff --git a/src/compress/testdata/Isaac.Newton-Opticks.txt b/src/testdata/Isaac.Newton-Opticks.txt
similarity index 100%
rename from src/compress/testdata/Isaac.Newton-Opticks.txt
rename to src/testdata/Isaac.Newton-Opticks.txt