Tidy up test scripts

twpayne · Aug 14, 2021 · dc319c4 · dc319c4
1 parent de5cb42
commit dc319c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/internal/cmd/testdata/scripts/init.txt b/internal/cmd/testdata/scripts/init.txt
@@ -82,7 +82,7 @@ grep '# edited' $HOME/.file
 # test chezmoi init --config-path
 chhome home10/user
 mkgitconfig
-chezmoi init --config-path=$HOME/.chezmoi.toml --debug file://$WORK/home/user/.local/share/chezmoi
+chezmoi init --config-path=$HOME/.chezmoi.toml file://$WORK/home/user/.local/share/chezmoi
 cmp $HOME/.chezmoi.toml golden/chezmoi.toml
 ! exists $CHEZMOICONFIGDIR/chezmoi.toml
 

diff --git a/internal/cmd/testdata/scripts/merge_unix.txt b/internal/cmd/testdata/scripts/merge_unix.txt
@@ -1,6 +1,5 @@
 [windows] skip 'UNIX only'
 
-chmod 755 bin/vimdiff
 mkhomedir
 mksourcedir
 
@@ -16,15 +15,15 @@ chhome home2/user
 chezmoi merge $HOME${/}.file
 stdout ^${CHEZMOISOURCEDIR@R}/dot_file\s+${HOME@R}/\.file\s+${WORK@R}/.*/\.file$
 
--- bin/vimdiff --
-#!/bin/sh
-
-echo "$*"
+-- home/user/.config/chezmoi/chezmoi.toml --
+[merge]
+    command = "echo"
 -- home/user/.invalid_template --
 -- home/user/.local/share/chezmoi/dot_invalid_template.tmpl --
 {{
 -- home2/user/.config/chezmoi/chezmoi.toml --
 [merge]
+    command = "echo"
     args = ["{{ .Source }}", "{{ .Destination }}", "{{ .Target }}"]
 -- home2/user/.file --
 # destination