Merge "Make multiproduct_kati return error"
This commit is contained in:
@@ -135,7 +135,7 @@ func main() {
|
|||||||
writer := terminal.NewWriter(terminal.StdioImpl{})
|
writer := terminal.NewWriter(terminal.StdioImpl{})
|
||||||
defer writer.Finish()
|
defer writer.Finish()
|
||||||
|
|
||||||
log := logger.New(os.Stderr)
|
log := logger.New(writer)
|
||||||
defer log.Cleanup()
|
defer log.Cleanup()
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
@@ -150,6 +150,9 @@ func main() {
|
|||||||
defer stat.Finish()
|
defer stat.Finish()
|
||||||
stat.AddOutput(terminal.NewStatusOutput(writer, ""))
|
stat.AddOutput(terminal.NewStatusOutput(writer, ""))
|
||||||
|
|
||||||
|
var failures failureCount
|
||||||
|
stat.AddOutput(&failures)
|
||||||
|
|
||||||
build.SetupSignals(log, cancel, func() {
|
build.SetupSignals(log, cancel, func() {
|
||||||
trace.Close()
|
trace.Close()
|
||||||
log.Cleanup()
|
log.Cleanup()
|
||||||
@@ -386,4 +389,30 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
s.Finish()
|
s.Finish()
|
||||||
|
|
||||||
|
if failures == 1 {
|
||||||
|
log.Fatal("1 failure")
|
||||||
|
} else if failures > 1 {
|
||||||
|
log.Fatalf("%d failures", failures)
|
||||||
|
} else {
|
||||||
|
writer.Print("Success")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type failureCount int
|
||||||
|
|
||||||
|
func (f *failureCount) StartAction(action *status.Action, counts status.Counts) {}
|
||||||
|
|
||||||
|
func (f *failureCount) FinishAction(result status.ActionResult, counts status.Counts) {
|
||||||
|
if result.Error != nil {
|
||||||
|
*f += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *failureCount) Message(level status.MsgLevel, message string) {
|
||||||
|
if level >= status.ErrorLvl {
|
||||||
|
*f += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *failureCount) Flush() {}
|
||||||
|
Reference in New Issue
Block a user