fix silent_multiline

s/silient/silent/

3 files changed, 95 insertions, 64 deletions

diff --git a/exec.go b/exec.go
index 87744da..fd99adb 100644
--- a/exec.go
+++ b/exec.go
@@ -53,62 +53,85 @@ func (ex *Executor) exists(target string) bool {
 	return exists(target)
 }
 
-func (ex *Executor) runCommands(cmds []string, output string) error {
-Loop:
-	for _, cmd := range cmds {
-		echo := true
-		ignoreErr := false
-		for {
-			cmd = strings.TrimLeft(cmd, " \t")
-			if cmd == "" {
-				continue Loop
-			}
-			switch cmd[0] {
-			case '@':
-				echo = false
-				cmd = cmd[1:]
-				continue
-			case '-':
-				ignoreErr = true
-				cmd = cmd[1:]
-				continue
-			}
-			break
-		}
-		if echo {
-			fmt.Printf("%s\n", cmd)
-		}
-		if dryRunFlag {
-			continue
-		}
+type runner struct {
+	output      string
+	cmd         string
+	echo        bool
+	dryRun      bool
+	ignoreError bool
+}
+
+func evalCmd(ev *Evaluator, r runner, s string) []runner {
+	r = newRunner(r, s)
+	if strings.IndexByte(r.cmd, '$') < 0 {
+		// fast path
+		return []runner{r}
+	}
+	cmds := ev.evalExpr(r.cmd)
+	var runners []runner
+	for _, cmd := range strings.Split(cmds, "\n") {
+		runners = append(runners, newRunner(r, cmd))
+	}
+	return runners
+}
 
-		args := []string{"/bin/sh", "-c", cmd}
-		cmd := exec.Cmd{
-			Path: args[0],
-			Args: args,
+func newRunner(r runner, s string) runner {
+	for {
+		s = strings.TrimLeft(s, " \t")
+		if s == "" {
+			return runner{}
 		}
-		out, err := cmd.CombinedOutput()
-		exit := 0
-		if err != nil {
-			exit = 1
-			if err, ok := err.(*exec.ExitError); ok {
-				if w, ok := err.ProcessState.Sys().(syscall.WaitStatus); ok {
-					exit = w.ExitStatus()
-				}
-			} else {
-				return err
+		switch s[0] {
+		case '@':
+			if !r.dryRun {
+				r.echo = false
 			}
+			s = s[1:]
+			continue
+		case '-':
+			r.ignoreError = true
+			s = s[1:]
+			continue
 		}
-		fmt.Printf("%s", out)
-		if exit != 0 {
-			if ignoreErr {
-				fmt.Printf("[%s] Error %d (ignored)\n", output, exit)
-				continue
-			}
-			return fmt.Errorf("command failed: %q. Error %d", cmd, exit)
+		break
+	}
+	r.cmd = s
+	return r
+}
+
+func (r runner) run() error {
+	if r.echo {
+		fmt.Printf("%s\n", r.cmd)
+	}
+	if r.dryRun {
+		return nil
+	}
+	args := []string{"/bin/sh", "-c", r.cmd}
+	cmd := exec.Cmd{
+		Path: args[0],
+		Args: args,
+	}
+	out, err := cmd.CombinedOutput()
+	fmt.Printf("%s", out)
+	exit := exitStatus(err)
+	if r.ignoreError && exit != 0 {
+		fmt.Printf("[%s] Error %d (ignored)\n", r.output, exit)
+		err = nil
+	}
+	return err
+}
+
+func exitStatus(err error) int {
+	if err == nil {
+		return 0
+	}
+	exit := 1
+	if err, ok := err.(*exec.ExitError); ok {
+		if w, ok := err.ProcessState.Sys().(syscall.WaitStatus); ok {
+			return w.ExitStatus()
 		}
 	}
-	return nil
+	return exit
 }
 
 func replaceSuffix(s string, newsuf string) string {
@@ -284,22 +307,23 @@ func (ex *Executor) build(vars *VarTab, output string) (int64, error) {
 	ev := newEvaluator(localVars)
 	ev.filename = rule.filename
 	ev.lineno = rule.cmdLineno
-	var cmds []string
+	var runners []runner
 	Log("Building: %s cmds:%q", output, rule.cmds)
+	r := runner{
+		output: output,
+		echo:   true,
+		dryRun: dryRunFlag,
+	}
 	for _, cmd := range rule.cmds {
-		if strings.IndexByte(cmd, '$') < 0 {
-			// fast path.
-			cmds = append(cmds, cmd)
-			continue
-		}
-		ecmd := ev.evalExpr(cmd)
-		Log("build eval:%q => %q", cmd, ecmd)
-		cmds = append(cmds, strings.Split(ecmd, "\n")...)
+		runners = append(runners, evalCmd(ev, r, cmd)...)
 	}
-
-	err := ex.runCommands(cmds, output)
-	if err != nil {
-		return outputTs, err
+	for _, r := range runners {
+		err := r.run()
+		if err != nil {
+			exit := exitStatus(err)
+			fmt.Printf("[%s] Error %d: %v\n", r.output, exit, err)
+			return outputTs, err
+		}
 	}
 
 	outputTs = getTimestamp(output)
diff --git a/testcase/silient.mk b/testcase/silent.mk
index a2b5ddf..a2b5ddf 100644
--- a/testcase/silient.mk
+++ b/testcase/silent.mk
diff --git a/testcase/silent_multiline.mk b/testcase/silent_multiline.mk
index 92a146e..645c357 100644
--- a/testcase/silent_multiline.mk
+++ b/testcase/silent_multiline.mk
@@ -1,8 +1,15 @@
-# TODO
 define cmd
 echo foo
 echo bar
 endef
 
+define cmd2
+echo baz
+@$(call cmd)
+endef
+
 test:
+	$(call cmd)
 	@$(call cmd)
+	$(call cmd2)
+	@$(call cmd2)