Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print root.log to Stdout in case of mock error #112

Merged
merged 1 commit into from
May 31, 2024
Merged

Print root.log to Stdout in case of mock error #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions impl/mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,25 +189,30 @@ func (bldr *mockBuilder) mockArgs(extraArgs []string) []string {
return mockArgs
}

func (bldr *mockBuilder) printLogFile(filename string) {
resultdir := getMockResultsDir(bldr.pkg, bldr.arch)
logPath := filepath.Join(resultdir, filename)
if util.CheckPath(logPath, false, false) == nil {
bldr.log("--- start of mock %s ---", filename)
dumpLogCmd := exec.Command("cat", logPath)
dumpLogCmd.Stderr = os.Stderr
dumpLogCmd.Stdout = os.Stdout
if dumpLogCmd.Run() != nil {
bldr.log("Dumping logfile failed")
}
bldr.log("--- end of %s ---", filename)
} else {
bldr.log("No %s found", filename)
}
}

func (bldr *mockBuilder) runMockCmd(extraArgs []string) error {
mockArgs := bldr.mockArgs(extraArgs)
bldr.log("Running mock %s", strings.Join(mockArgs, " "))
mockErr := util.RunSystemCmd("mock", mockArgs...)
if mockErr != nil {
resultdir := getMockResultsDir(bldr.pkg, bldr.arch)
buildLogPath := filepath.Join(resultdir, "build.log")
if util.CheckPath(buildLogPath, false, false) == nil {
bldr.log("--- start of mock build.log ---")
dumpLogCmd := exec.Command("cat", buildLogPath)
dumpLogCmd.Stderr = os.Stderr
dumpLogCmd.Stdout = os.Stdout
if dumpLogCmd.Run() != nil {
bldr.log("Dumping logfile failed")
}
bldr.log("--- end of build.log ---")
} else {
bldr.log("No build.log found")
}
bldr.printLogFile("root.log")
bldr.printLogFile("build.log")
return fmt.Errorf("%smock %s errored out with %s",
bldr.errPrefix, strings.Join(mockArgs, " "), mockErr)
}
Expand Down
Loading