diff --git a/testscript/cmd.go b/cmd.go similarity index 100% rename from testscript/cmd.go rename to cmd.go diff --git a/cmd/testscript/main.go b/cmd/testscript/main.go index 396598e9..da846090 100644 --- 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 index 54f684a2..7e22407d 100644 --- 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 b/doc.go similarity index 100% rename from testscript/doc.go rename to doc.go diff --git a/testscript/envvarname.go b/envvarname.go similarity index 100% rename from testscript/envvarname.go rename to envvarname.go diff --git a/testscript/envvarname_windows.go b/envvarname_windows.go similarity index 100% rename from testscript/envvarname_windows.go rename to envvarname_windows.go diff --git a/testscript/exe.go b/exe.go similarity index 100% rename from testscript/exe.go rename to exe.go diff --git a/testscript/exe_go118.go b/exe_go118.go similarity index 100% rename from testscript/exe_go118.go rename to exe_go118.go diff --git a/go.mod b/go.mod index dfe05223..fc993176 100644 --- 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 b/testdata/big_diff.txt similarity index 100% rename from testscript/testdata/big_diff.txt rename to testdata/big_diff.txt diff --git a/testscript/testdata/cmpenv.txt b/testdata/cmpenv.txt similarity index 100% rename from testscript/testdata/cmpenv.txt rename to testdata/cmpenv.txt diff --git a/testscript/testdata/command.txt b/testdata/command.txt similarity index 100% rename from testscript/testdata/command.txt rename to testdata/command.txt diff --git a/testscript/testdata/commandstatus.txt b/testdata/commandstatus.txt similarity index 100% rename from testscript/testdata/commandstatus.txt rename to testdata/commandstatus.txt diff --git a/testscript/testdata/cond.txt b/testdata/cond.txt similarity index 100% rename from testscript/testdata/cond.txt rename to testdata/cond.txt diff --git a/testscript/testdata/cpstdout.txt b/testdata/cpstdout.txt similarity index 100% rename from testscript/testdata/cpstdout.txt rename to testdata/cpstdout.txt diff --git a/testscript/testdata/defer.txt b/testdata/defer.txt similarity index 100% rename from testscript/testdata/defer.txt rename to testdata/defer.txt diff --git a/testscript/testdata/evalsymlink.txt b/testdata/evalsymlink.txt similarity index 100% rename from testscript/testdata/evalsymlink.txt rename to testdata/evalsymlink.txt diff --git a/testscript/testdata/exec_path_change.txt b/testdata/exec_path_change.txt similarity index 100% rename from testscript/testdata/exec_path_change.txt rename to testdata/exec_path_change.txt diff --git a/testscript/testdata/execguard.txt b/testdata/execguard.txt similarity index 100% rename from testscript/testdata/execguard.txt rename to testdata/execguard.txt diff --git a/testscript/testdata/exists.txt b/testdata/exists.txt similarity index 100% rename from testscript/testdata/exists.txt rename to testdata/exists.txt diff --git a/testscript/testdata/hello.txt b/testdata/hello.txt similarity index 100% rename from testscript/testdata/hello.txt rename to testdata/hello.txt diff --git a/testscript/testdata/interrupt.txt b/testdata/interrupt.txt similarity index 100% rename from testscript/testdata/interrupt.txt rename to testdata/interrupt.txt diff --git a/testscript/testdata/long_diff.txt b/testdata/long_diff.txt similarity index 100% rename from testscript/testdata/long_diff.txt rename to testdata/long_diff.txt diff --git a/testscript/testdata/nothing.txtar b/testdata/nothing.txtar similarity index 100% rename from testscript/testdata/nothing.txtar rename to testdata/nothing.txtar diff --git a/testscript/testdata/nothing/nothing.txtar b/testdata/nothing/nothing.txtar similarity index 100% rename from testscript/testdata/nothing/nothing.txtar rename to testdata/nothing/nothing.txtar diff --git a/testscript/testdata/readfile.txt b/testdata/readfile.txt similarity index 100% rename from testscript/testdata/readfile.txt rename to testdata/readfile.txt diff --git a/testscript/testdata/regexpquote.txt b/testdata/regexpquote.txt similarity index 100% rename from testscript/testdata/regexpquote.txt rename to testdata/regexpquote.txt diff --git a/testscript/testdata/setenv.txt b/testdata/setenv.txt similarity index 100% rename from testscript/testdata/setenv.txt rename to testdata/setenv.txt diff --git a/testscript/testdata/setupfiles.txt b/testdata/setupfiles.txt similarity index 100% rename from testscript/testdata/setupfiles.txt rename to testdata/setupfiles.txt diff --git a/testscript/testdata/stdin.txt b/testdata/stdin.txt similarity index 100% rename from testscript/testdata/stdin.txt rename to testdata/stdin.txt diff --git a/testscript/testdata/testscript_duplicate_name.txt b/testdata/testscript_duplicate_name.txt similarity index 100% rename from testscript/testdata/testscript_duplicate_name.txt rename to testdata/testscript_duplicate_name.txt diff --git a/testscript/testdata/testscript_explicit_exec.txt b/testdata/testscript_explicit_exec.txt similarity index 100% rename from testscript/testdata/testscript_explicit_exec.txt rename to testdata/testscript_explicit_exec.txt diff --git a/testscript/testdata/testscript_logging.txt b/testdata/testscript_logging.txt similarity index 100% rename from testscript/testdata/testscript_logging.txt rename to testdata/testscript_logging.txt diff --git a/testscript/testdata/testscript_update_script.txt b/testdata/testscript_update_script.txt similarity index 100% rename from testscript/testdata/testscript_update_script.txt rename to testdata/testscript_update_script.txt diff --git a/testscript/testdata/testscript_update_script_actual_is_file.txt b/testdata/testscript_update_script_actual_is_file.txt similarity index 100% rename from testscript/testdata/testscript_update_script_actual_is_file.txt rename to testdata/testscript_update_script_actual_is_file.txt diff --git a/testscript/testdata/testscript_update_script_expected_not_in_archive.txt b/testdata/testscript_update_script_expected_not_in_archive.txt similarity index 100% rename from testscript/testdata/testscript_update_script_expected_not_in_archive.txt rename to testdata/testscript_update_script_expected_not_in_archive.txt diff --git a/testscript/testdata/testscript_update_script_quote.txt b/testdata/testscript_update_script_quote.txt similarity index 100% rename from testscript/testdata/testscript_update_script_quote.txt rename to testdata/testscript_update_script_quote.txt diff --git a/testscript/testdata/testscript_update_script_stderr.txt b/testdata/testscript_update_script_stderr.txt similarity index 100% rename from testscript/testdata/testscript_update_script_stderr.txt rename to testdata/testscript_update_script_stderr.txt diff --git a/testscript/testdata/values.txt b/testdata/values.txt similarity index 100% rename from testscript/testdata/values.txt rename to testdata/values.txt diff --git a/testscript/testdata/wait.txt b/testdata/wait.txt similarity index 100% rename from testscript/testdata/wait.txt rename to testdata/wait.txt diff --git a/testscript/testscript.go b/testscript.go similarity index 100% rename from testscript/testscript.go rename to testscript.go diff --git a/testscript/testscript_test.go b/testscript_test.go similarity index 100% rename from testscript/testscript_test.go rename to testscript_test.go