mirror of https://github.com/golang/go.git
cmd: relocate cmd/go/internal/script to cmd/internal/script
Relocate cmd/go's internal/script package up a level into cmd/internal/script, so as to enable the use of script tests in other cmd packages. No change in functionality. Updates #68606. Change-Id: I3974b0bf59c76e0f459184c9f3090d6077dd5d91 Reviewed-on: https://go-review.googlesource.com/c/go/+/601358 Reviewed-by: Michael Matloob <matloob@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
parent
6b2ffc72b6
commit
32b55eda5e
|
|
@ -7,7 +7,7 @@ package vcweb
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
"cmd/go/internal/script"
|
"cmd/internal/script"
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ package vcweb
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"cmd/go/internal/script"
|
"cmd/internal/script"
|
||||||
"context"
|
"context"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"errors"
|
"errors"
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@ import (
|
||||||
|
|
||||||
"cmd/go/internal/cfg"
|
"cmd/go/internal/cfg"
|
||||||
"cmd/go/internal/gover"
|
"cmd/go/internal/gover"
|
||||||
"cmd/go/internal/script"
|
|
||||||
"cmd/go/internal/script/scripttest"
|
|
||||||
"cmd/go/internal/vcweb/vcstest"
|
"cmd/go/internal/vcweb/vcstest"
|
||||||
|
"cmd/internal/script"
|
||||||
|
"cmd/internal/script/scripttest"
|
||||||
|
|
||||||
"golang.org/x/telemetry/counter/countertest"
|
"golang.org/x/telemetry/counter/countertest"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@
|
||||||
package main_test
|
package main_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"cmd/go/internal/script"
|
|
||||||
"cmd/go/internal/script/scripttest"
|
|
||||||
"cmd/go/internal/work"
|
"cmd/go/internal/work"
|
||||||
|
"cmd/internal/script"
|
||||||
|
"cmd/internal/script/scripttest"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@ package main_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"cmd/go/internal/cfg"
|
"cmd/go/internal/cfg"
|
||||||
"cmd/go/internal/script"
|
"cmd/internal/script"
|
||||||
"cmd/go/internal/script/scripttest"
|
"cmd/internal/script/scripttest"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"internal/buildcfg"
|
"internal/buildcfg"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ package main_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"cmd/go/internal/script"
|
"cmd/internal/script"
|
||||||
"flag"
|
"flag"
|
||||||
"internal/diff"
|
"internal/diff"
|
||||||
"internal/testenv"
|
"internal/testenv"
|
||||||
|
|
@ -38,7 +38,7 @@ func checkScriptReadme(t *testing.T, engine *script.Engine, env []string) {
|
||||||
args.Conditions = conds.String()
|
args.Conditions = conds.String()
|
||||||
|
|
||||||
doc := new(strings.Builder)
|
doc := new(strings.Builder)
|
||||||
cmd := testenv.Command(t, testGo, "doc", "cmd/go/internal/script")
|
cmd := testenv.Command(t, testGo, "doc", "cmd/internal/script")
|
||||||
cmd.Env = env
|
cmd.Env = env
|
||||||
cmd.Stdout = doc
|
cmd.Stdout = doc
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ package scripttest
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"cmd/go/internal/script"
|
|
||||||
"cmd/internal/pathcache"
|
"cmd/internal/pathcache"
|
||||||
|
"cmd/internal/script"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
Loading…
Reference in New Issue