testing: Simplify line ending handling in tests

diff --git a/main_test.go b/main_test.go
index 31a0a9683eaff485966cc1dc22845c566581f265..36a28debce79671a2d129ff4e89b642596fb258c 100644 (file)
--- a/main_test.go
+++ b/main_test.go
@@ -87,18 +87,6 @@ var commonTestScriptsParam = testscript.Params{
                "log": func(ts *testscript.TestScript, neg bool, args []string) {
                        log.Println(args)
                },
-               // dostounix converts \r\n to \n.
-               "dostounix": func(ts *testscript.TestScript, neg bool, args []string) {
-                       filename := ts.MkAbs(args[0])
-                       b, err := os.ReadFile(filename)
-                       if err != nil {
-                               ts.Fatalf("%v", err)
-                       }
-                       b = bytes.Replace(b, []byte("\r\n"), []byte{'\n'}, -1)
-                       if err := os.WriteFile(filename, b, 0o666); err != nil {
-                               ts.Fatalf("%v", err)
-                       }
-               },
                // cat prints a file to stdout.
                "cat": func(ts *testscript.TestScript, neg bool, args []string) {
                        filename := ts.MkAbs(args[0])

diff --git a/testscripts/.gitattributes b/testscripts/.gitattributes
new file mode 100644 (file)
index 0000000..6313b56
--- /dev/null
+++ b/testscripts/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf

diff --git a/testscripts/commands/mod.txt b/testscripts/commands/mod.txt
index 8500336cc8a6a6ac52e48d01598fca860666d71a..ee0a9adec563c6f406f8bbd801e23a7a6862a90d 100644 (file)
--- a/testscripts/commands/mod.txt
+++ b/testscripts/commands/mod.txt
@@ -1,8 +1,5 @@
 # Test the hugo mod commands.
 
-dostounix golden/vendor.txt
-dostounix golden/go.mod.testsubmod
-
 hugo mod graph
 stdout 'empty-hugo'
 hugo mod verify

diff --git a/testscripts/commands/mod_init.txt b/testscripts/commands/mod_init.txt
index 55df0924f76c31b04c385fcbad7c81090801ca58..64f775a5867ebbfaf5d285d5001fb1b4591969e8 100644 (file)
--- a/testscripts/commands/mod_init.txt
+++ b/testscripts/commands/mod_init.txt
@@ -1,5 +1,4 @@
 # Test the hugo init command.
-dostounix golden/go.mod.testsubmod
 
 hugo mod init testsubmod
 cmpenv go.mod $WORK/golden/go.mod.testsubmod

diff --git a/testscripts/commands/mod_npm.txt b/testscripts/commands/mod_npm.txt
index 44bd8c25ac3f169f3e3cf907f7da0f980c86304f..169f26c172ee70a38a7d2c9631981828f7ef1a28 100644 (file)
--- a/testscripts/commands/mod_npm.txt
+++ b/testscripts/commands/mod_npm.txt
@@ -1,13 +1,5 @@
 # Test mod npm pack.
 
-dostounix golden1/package.json
-dostounix golden1/packages/hugoautogen/package.json
-dostounix golden1/packages/hugoautogen/hugo_packagemeta.json
-dostounix golden2/packages/hugoautogen/package.json
-dostounix golden3/packages/hugoautogen/package.json
-dostounix golden4/packages/hugoautogen/package.json
-dostounix golden5/packages/hugoautogen/package.json
-
 hugo mod npm pack
 cmp packages/hugoautogen/package.json golden1/packages/hugoautogen/package.json
 cmp package.json golden1/package.json

diff --git a/testscripts/commands/mod_npm__moduleorder.txt b/testscripts/commands/mod_npm__moduleorder.txt
index 0b9e783eb54358970010222341d375581bfc37a9..1d4580c4d390fcb450e005cf3b4ac689060ead68 100644 (file)
--- a/testscripts/commands/mod_npm__moduleorder.txt
+++ b/testscripts/commands/mod_npm__moduleorder.txt
@@ -1,9 +1,5 @@
 # Test mod npm pack with shuffled modules.
 
-dostounix golden1/package.json
-dostounix golden1/packages/hugoautogen/package.json
-dostounix golden1/packages/hugoautogen/hugo_packagemeta.json
-
 hugo mod npm pack
 cmp packages/hugoautogen/package.json golden1/packages/hugoautogen/package.json
 cmp package.json golden1/package.json

diff --git a/testscripts/commands/mod_npm_withexisting.txt b/testscripts/commands/mod_npm_withexisting.txt
index 33382475c2ea9c92b016802e0e27e8991e1e7cbc..b11a4a3b6a62e04179a3329d3149597a35afef5d 100644 (file)
--- a/testscripts/commands/mod_npm_withexisting.txt
+++ b/testscripts/commands/mod_npm_withexisting.txt
@@ -3,9 +3,6 @@
 # See https://github.com/gohugoio/hugo/issues/13465
 [windows] skip
 
-dostounix golden/packages/hugoautogen/package.json
-dostounix golden/package.json
-
 hugo mod npm pack
 cmp packages/hugoautogen/package.json golden/packages/hugoautogen/package.json
 cmp package.json golden/package.json

diff --git a/testscripts/commands/mod_tidy.txt b/testscripts/commands/mod_tidy.txt
index 6e8d37f64880986b37abe05b6be716864710554d..1a250f37086abcf8fb6cfa318e7789b28b4d5d32 100644 (file)
--- a/testscripts/commands/mod_tidy.txt
+++ b/testscripts/commands/mod_tidy.txt
@@ -1,7 +1,5 @@
 # Test hugo mod tidy.
 
-dostounix golden/go.mod.cleaned
-
 hugo mod tidy
 
 cmp go.mod golden/go.mod.cleaned

diff --git a/testscripts/commands/mod_vendor.txt b/testscripts/commands/mod_vendor.txt
index 20862c14e31c53088eb563098cdc0628f3fabaaa..53bb895fb2037bdde8a4cfe1fe27a16589a4ab2b 100644 (file)
--- a/testscripts/commands/mod_vendor.txt
+++ b/testscripts/commands/mod_vendor.txt
@@ -1,5 +1,3 @@
-dostounix golden/vendor.txt
-
 hugo mod vendor
 cmp _vendor/modules.txt golden/vendor.txt
 ls _vendor/github.com/gohugoio/hugo-mod-integrationtests/withconfigtoml

diff --git a/testscripts/commands/mod_vendor__versions.txt b/testscripts/commands/mod_vendor__versions.txt
index 10a8a0367abead45288153d67ad89de40e8eac52..49070b93b2c5cd570e7627365e1b791c8f1f9164 100644 (file)
--- a/testscripts/commands/mod_vendor__versions.txt
+++ b/testscripts/commands/mod_vendor__versions.txt
@@ -1,5 +1,3 @@
-dostounix golden/vendor.txt
-
 hugo mod vendor
 cmp _vendor/modules.txt golden/vendor.txt
 lsr _vendor