use testscript.Params.RequireExplicitExec

For the sake of consistency.

Author: mvdan

main_test.go

@@ -25,7 +25,7 @@ func TestMain(m *testing.M) {
 
 var update = flag.Bool("u", false, "update testscript output files")
 
-func TestScripts(t *testing.T) {
+func TestScript(t *testing.T) {
 	t.Parallel()
 
 	var goEnv struct {
@@ -42,8 +42,9 @@ func TestScripts(t *testing.T) {
 	}
 
 	p := testscript.Params{
-		Dir:           filepath.Join("testdata", "script"),
-		UpdateScripts: *update,
+		Dir:                 filepath.Join("testdata", "script"),
+		UpdateScripts:       *update,
+		RequireExplicitExec: true,
 		Setup: func(env *testscript.Env) error {
 			env.Setenv("GOCACHE", goEnv.GOCACHE)
 			env.Setenv("GOMODCACHE", goEnv.GOMODCACHE)

testdata/script/assignment-newlines.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/block-empty.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/block-single.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/cgo.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/comment-spaced.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/composite-literals-leading-lines.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/composite-multiline.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/decl-group-many.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/decl-group-single.txtar

@@ -1,8 +1,8 @@
-gofumpt -w f1.go f2.go
+exec gofumpt -w f1.go f2.go
 cmp f1.go f1.go.golden
 cmp f2.go f2.go.golden
 
-gofumpt -d f1.go.golden f2.go.golden
+exec gofumpt -d f1.go.golden f2.go.golden
 ! stdout .
 
 -- f1.go --

testdata/script/decls-separated.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/deprecated-flags.txtar

@@ -1,13 +1,13 @@
 cp foo.orig.go foo.go
-! gofumpt -w -r foo foo.go
+! exec gofumpt -w -r foo foo.go
 stderr 'the rewrite flag is no longer available; use "gofmt -r" instead\n'
 cmp foo.orig.go foo.go
 
-gofumpt -w -s foo.go
+exec gofumpt -w -s foo.go
 stderr 'warning: -s is deprecated as it is always enabled\n'
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.orig.go --

testdata/script/diagnose.txtar

@@ -5,30 +5,30 @@ env GO_VERSION_TEST=go1.18.29
 # we mock the VCS information. Note that test binaries do not have VCS info.
 # Data obtained from a real build while developing.
 env GARBLE_TEST_BUILDSETTINGS='[{"Key":"vcs","Value":"git"},{"Key":"vcs.revision","Value":"8dda8068d9f339047fc1777b688afb66a0a0db17"},{"Key":"vcs.time","Value":"2022-07-27T15:58:40Z"},{"Key":"vcs.modified","Value":"true"}]'  
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go.golden
 
-gofumpt outdated.go
+exec gofumpt outdated.go
 cmp stdout foo.go.golden
 
-gofumpt -extra foo.go
+exec gofumpt -extra foo.go
 cmp stdout foo.go.golden-extra
 
-gofumpt -lang=v1 foo.go
+exec gofumpt -lang=v1 foo.go
 cmp stdout foo.go.golden-lang
 
-gofumpt -d nochange.go
+exec gofumpt -d nochange.go
 ! stdout .
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
-gofumpt -d -extra foo.go.golden-extra
+exec gofumpt -d -extra foo.go.golden-extra
 ! stdout .
 
 # A local build without VCS information will result in a missing version.
 env GARBLE_TEST_BUILDSETTINGS='[]'
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go.golden-devel
 
 [short] stop 'the rest of this test builds gofumpt binaries'

testdata/script/func-merge-parameters.txtar

@@ -1,12 +1,12 @@
 # By default, this rule isn't enabled.
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go
 
 # It's run with -extra.
-gofumpt -extra foo.go
+exec gofumpt -extra foo.go
 cmp stdout foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/func-newlines.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/generated.txtar

@@ -1,14 +1,14 @@
 # Explicitly given generated files are formatted with our rules.
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go.golden
 
 # stdin is still considered an explicit file.
 stdin foo.go
-gofumpt
+exec gofumpt
 cmp stdout foo.go.golden
 
 # Implicitly walked generated files get formatted without the added rules.
-gofumpt -l .
+exec gofumpt -l .
 stdout -count=1 '^badgofmt.go$'
 ! stdout '^foo.go$'
 ! stderr .

testdata/script/ignore-implicit-vendor.txtar

@@ -1,27 +1,27 @@
-gofumpt orig.go.golden
+exec gofumpt orig.go.golden
 cp stdout formatted.go.golden
 mkdir -p vendor/foo
 cp orig.go.golden vendor/foo/foo.go
 
 # format explicit vendor dir
-gofumpt -l vendor
+exec gofumpt -l vendor
 stdout -count=1 'vendor[/\\]foo[/\\]foo.go'
 ! stderr .
 
 # format explicit vendor file
-gofumpt -l vendor/foo/foo.go
+exec gofumpt -l vendor/foo/foo.go
 stdout -count=1 'vendor[/\\]foo[/\\]foo.go'
 ! stderr .
 
 # ignore implicit vendor call
-gofumpt -l .
+exec gofumpt -l .
 ! stdout .
 ! stderr .
 
 # format explicit vendor pkg while ignoring rest
 mkdir vendor/ignore
 cp orig.go.golden vendor/ignore/ignore.go
-gofumpt -l vendor/foo .
+exec gofumpt -l vendor/foo .
 stdout -count=1 'vendor[/\\]foo[/\\]foo.go'
 ! stderr .
 

testdata/script/interface.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/long-lines.txtar

@@ -1,13 +1,13 @@
 cp foo.go foo.go.orig
 
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.orig
 
 env GOFUMPT_SPLIT_LONG_LINES=on
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/missing-import.txtar

@@ -1,5 +1,5 @@
 # A missing import shouldn't matter nor be fixed by gofumpt.
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go
 
 -- foo.go --

testdata/script/newline-errcheck.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/octal-literals.txtar

@@ -1,26 +1,26 @@
 # Initially, the Go language version is too low.
-gofumpt -l .
+exec gofumpt -l .
 ! stdout .
 
 # We can give an explicitly newer version.
-gofumpt -lang=1.13 -l .
+exec gofumpt -lang=1.13 -l .
 stdout -count=1 'foo\.go'
 stdout -count=1 'nested[/\\]nested\.go'
 
 # If we bump the version in go.mod, it should be picked up.
 exec go mod edit -go=1.13
-gofumpt -l .
+exec gofumpt -l .
 stdout -count=1 'foo\.go'
 ! stdout 'nested'
 
 # Ensure we produce the output we expect, and that it's stable.
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go.golden
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 # We can give an explicitly older version, too
-gofumpt -lang=v1 -l .
+exec gofumpt -lang=v1 -l .
 ! stdout .
 
 -- go.mod --

testdata/script/short-case.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/short-decl.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- foo.go --

testdata/script/simplify.txtar

@@ -1,5 +1,5 @@
 # gofumpt changes -s to default to true.
-gofumpt foo.go
+exec gofumpt foo.go
 cmp stdout foo.go.golden
 
 -- foo.go --

testdata/script/std-imports.txtar

@@ -1,7 +1,7 @@
-gofumpt -w foo.go
+exec gofumpt -w foo.go
 cmp foo.go foo.go.golden
 
-gofumpt -d foo.go.golden
+exec gofumpt -d foo.go.golden
 ! stdout .
 
 -- go.mod --

testdata/script/typeparams.txtar

@@ -1,5 +1,5 @@
-[go1.18] gofumpt foo.go
-[!go1.18] ! gofumpt foo.go
+[go1.18] exec gofumpt foo.go
+[!go1.18] ! exec gofumpt foo.go
 
 [go1.18] cmp stdout foo.go.golden
 [!go1.18] stderr 'foo.go:.*expected'

testdata/script/workspaces.txtar

@@ -4,11 +4,11 @@
 # we should always use the information from its go.mod.
 # We also test that we don't get confused by the presence of go.work.
 
-gofumpt a/go112.go
+exec gofumpt a/go112.go
 cmp stdout a/go113.go
 
 cd a
-gofumpt go112.go
+exec gofumpt go112.go
 cmp stdout go113.go
 
 -- go.work --