move testscript at toplevel, avoids stutter. declare we need go1.20 o…

…therwise coverage etc doesn't work
rogpeppe · Mar 29, 2023 · 8dc95ca · 8dc95ca
1 parent 7dd2019
commit 8dc95ca
Show file tree

Hide file tree

Showing 42 changed files with 3 additions and 3 deletions.
diff --git a/testscript/cmd.go → cmd.go b/testscript/cmd.go → cmd.go
diff --git a/cmd/testscript/main.go b/cmd/testscript/main.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"fortio.org/testscript/testscript"
+	"fortio.org/testscript"
 	"golang.org/x/tools/txtar"
 )
 

diff --git a/cmd/testscript/main_test.go b/cmd/testscript/main_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 
 	"fortio.org/testscript/internal/os/execpath"
-	"fortio.org/testscript/testscript"
+	"fortio.org/testscript"
 )
 
 func TestMain(m *testing.M) {

diff --git a/testscript/doc.go → doc.go b/testscript/doc.go → doc.go
diff --git a/testscript/envvarname.go → envvarname.go b/testscript/envvarname.go → envvarname.go
diff --git a/testscript/envvarname_windows.go → envvarname_windows.go b/testscript/envvarname_windows.go → envvarname_windows.go
diff --git a/testscript/exe.go → exe.go b/testscript/exe.go → exe.go
diff --git a/testscript/exe_go118.go → exe_go118.go b/testscript/exe_go118.go → exe_go118.go
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module fortio.org/testscript
 
-go 1.19
+go 1.20
 
 require (
 	golang.org/x/mod v0.9.0

diff --git a/testscript/testdata/big_diff.txt → testdata/big_diff.txt b/testscript/testdata/big_diff.txt → testdata/big_diff.txt
diff --git a/testscript/testdata/cmpenv.txt → testdata/cmpenv.txt b/testscript/testdata/cmpenv.txt → testdata/cmpenv.txt
diff --git a/testscript/testdata/command.txt → testdata/command.txt b/testscript/testdata/command.txt → testdata/command.txt
diff --git a/testscript/testdata/commandstatus.txt → testdata/commandstatus.txt b/testscript/testdata/commandstatus.txt → testdata/commandstatus.txt
diff --git a/testscript/testdata/cond.txt → testdata/cond.txt b/testscript/testdata/cond.txt → testdata/cond.txt
diff --git a/testscript/testdata/cpstdout.txt → testdata/cpstdout.txt b/testscript/testdata/cpstdout.txt → testdata/cpstdout.txt
diff --git a/testscript/testdata/defer.txt → testdata/defer.txt b/testscript/testdata/defer.txt → testdata/defer.txt
diff --git a/testscript/testdata/evalsymlink.txt → testdata/evalsymlink.txt b/testscript/testdata/evalsymlink.txt → testdata/evalsymlink.txt
diff --git a/testscript/testdata/exec_path_change.txt → testdata/exec_path_change.txt b/testscript/testdata/exec_path_change.txt → testdata/exec_path_change.txt
diff --git a/testscript/testdata/execguard.txt → testdata/execguard.txt b/testscript/testdata/execguard.txt → testdata/execguard.txt
diff --git a/testscript/testdata/exists.txt → testdata/exists.txt b/testscript/testdata/exists.txt → testdata/exists.txt
diff --git a/testscript/testdata/hello.txt → testdata/hello.txt b/testscript/testdata/hello.txt → testdata/hello.txt
diff --git a/testscript/testdata/interrupt.txt → testdata/interrupt.txt b/testscript/testdata/interrupt.txt → testdata/interrupt.txt
diff --git a/testscript/testdata/long_diff.txt → testdata/long_diff.txt b/testscript/testdata/long_diff.txt → testdata/long_diff.txt
diff --git a/testscript/testdata/nothing.txtar → testdata/nothing.txtar b/testscript/testdata/nothing.txtar → testdata/nothing.txtar
diff --git a/testscript/testdata/nothing/nothing.txtar → testdata/nothing/nothing.txtar b/testscript/testdata/nothing/nothing.txtar → testdata/nothing/nothing.txtar
diff --git a/testscript/testdata/readfile.txt → testdata/readfile.txt b/testscript/testdata/readfile.txt → testdata/readfile.txt
diff --git a/testscript/testdata/regexpquote.txt → testdata/regexpquote.txt b/testscript/testdata/regexpquote.txt → testdata/regexpquote.txt
diff --git a/testscript/testdata/setenv.txt → testdata/setenv.txt b/testscript/testdata/setenv.txt → testdata/setenv.txt
diff --git a/testscript/testdata/setupfiles.txt → testdata/setupfiles.txt b/testscript/testdata/setupfiles.txt → testdata/setupfiles.txt
diff --git a/testscript/testdata/stdin.txt → testdata/stdin.txt b/testscript/testdata/stdin.txt → testdata/stdin.txt
diff --git a/...pt/testdata/testscript_duplicate_name.txt → testdata/testscript_duplicate_name.txt b/...pt/testdata/testscript_duplicate_name.txt → testdata/testscript_duplicate_name.txt
diff --git a/...ipt/testdata/testscript_explicit_exec.txt → testdata/testscript_explicit_exec.txt b/...ipt/testdata/testscript_explicit_exec.txt → testdata/testscript_explicit_exec.txt
diff --git a/testscript/testdata/testscript_logging.txt → testdata/testscript_logging.txt b/testscript/testdata/testscript_logging.txt → testdata/testscript_logging.txt
diff --git a/...ipt/testdata/testscript_update_script.txt → testdata/testscript_update_script.txt b/...ipt/testdata/testscript_update_script.txt → testdata/testscript_update_script.txt
diff --git a/...stscript_update_script_actual_is_file.txt → ...stscript_update_script_actual_is_file.txt b/...stscript_update_script_actual_is_file.txt → ...stscript_update_script_actual_is_file.txt
diff --git a/...update_script_expected_not_in_archive.txt → ...update_script_expected_not_in_archive.txt b/...update_script_expected_not_in_archive.txt → ...update_script_expected_not_in_archive.txt
diff --git a/...stdata/testscript_update_script_quote.txt → testdata/testscript_update_script_quote.txt b/...stdata/testscript_update_script_quote.txt → testdata/testscript_update_script_quote.txt
diff --git a/...tdata/testscript_update_script_stderr.txt → testdata/testscript_update_script_stderr.txt b/...tdata/testscript_update_script_stderr.txt → testdata/testscript_update_script_stderr.txt
diff --git a/testscript/testdata/values.txt → testdata/values.txt b/testscript/testdata/values.txt → testdata/values.txt
diff --git a/testscript/testdata/wait.txt → testdata/wait.txt b/testscript/testdata/wait.txt → testdata/wait.txt
diff --git a/testscript/testscript.go → testscript.go b/testscript/testscript.go → testscript.go
diff --git a/testscript/testscript_test.go → testscript_test.go b/testscript/testscript_test.go → testscript_test.go