cmd/testscript: minor bug fixes (#44)

rogpeppe · Jan 9, 2019 · abaa39a · abaa39a
1 parent dc3eec0
commit abaa39a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/cmd/testscript/main.go b/cmd/testscript/main.go
@@ -33,11 +33,15 @@ func main() {
 }
 
 func main1() int {
-	if err := mainerr(); err != nil {
+	switch err := mainerr(); err {
+	case nil:
+		return 0
+	case flag.ErrHelp:
+		return 2
+	default:
 		fmt.Fprintln(os.Stderr, err)
 		return 1
 	}
-	return 0
 }
 
 func mainerr() (retErr error) {
@@ -55,8 +59,9 @@ func mainerr() (retErr error) {
 	if err != nil {
 		return fmt.Errorf("unable to create temp dir: %v", err)
 	}
-	fmt.Printf("temporary work directory: %v\n", td)
-	if !*fWork {
+	if *fWork {
+		fmt.Fprintf(os.Stderr, "temporary work directory: %v\n", td)
+	} else {
 		defer os.RemoveAll(td)
 	}
 

diff --git a/cmd/testscript/testdata/work.txt b/cmd/testscript/testdata/work.txt
@@ -0,0 +1,8 @@
+# should support skip
+unquote file.txt
+
+testscript -v -work file.txt
+stderr '\Qtemporary work directory: '$WORK'\E[/\\]tmp[/\\]'
+
+-- file.txt --
+>exec true