diff options
| author | Ryan Beltran <ryanbeltran@chromium.org> | 2021-02-22 23:58:40 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-24 21:38:15 +0000 |
| commit | 7c59ee050a4e4935f9ac505f2776d8eea1c4d557 (patch) | |
| tree | 6680aadfb4ff06c16d9553f8b1cd25fdb3161b67 /compiler_wrapper/disable_werror_flag.go | |
| parent | 2e0f7c655333c4336937f72a6ceca9d9fe1f4ea9 (diff) | |
| download | toolchain-utils-7c59ee050a4e4935f9ac505f2776d8eea1c4d557.tar.gz | |
compiler_wrapper: disable goma, ccache w/ rusage
Disables Goma and CCahce when rusage monitoring is requested.
This allows for usable metrics to be produced for more packages.
BUG=chromium:1156314
TEST=Modified and ran unit tests
Change-Id: I36415b4df6ce033b23ff8055e900233886e1889d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2713228
Tested-by: Ryan Beltran <ryanbeltran@chromium.org>
Commit-Queue: Ryan Beltran <ryanbeltran@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Denis Nikitin <denik@chromium.org>
Diffstat (limited to 'compiler_wrapper/disable_werror_flag.go')
| -rw-r--r-- | compiler_wrapper/disable_werror_flag.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler_wrapper/disable_werror_flag.go b/compiler_wrapper/disable_werror_flag.go index 9bbf2e25..5c21b1ad 100644 --- a/compiler_wrapper/disable_werror_flag.go +++ b/compiler_wrapper/disable_werror_flag.go @@ -61,7 +61,7 @@ func isLikelyAConfTest(cfg *config, cmd *command) bool { return false } -func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command, rusageLogfileName string) (exitCode int, err error) { +func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCode int, err error) { originalStdoutBuffer := &bytes.Buffer{} originalStderrBuffer := &bytes.Buffer{} // TODO: This is a bug in the old wrapper that it drops the ccache path @@ -76,7 +76,7 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command, rusageL } var originalExitCode int - commitOriginalRusage, err := maybeCaptureRusage(env, rusageLogfileName, originalCmd, func(willLogRusage bool) error { + commitOriginalRusage, err := maybeCaptureRusage(env, originalCmd, func(willLogRusage bool) error { originalExitCode, err = wrapSubprocessErrorWithSourceLoc(originalCmd, env.run(originalCmd, getStdin(), originalStdoutBuffer, originalStderrBuffer)) return err @@ -111,7 +111,7 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command, rusageL } var retryExitCode int - commitRetryRusage, err := maybeCaptureRusage(env, rusageLogfileName, retryCommand, func(willLogRusage bool) error { + commitRetryRusage, err := maybeCaptureRusage(env, retryCommand, func(willLogRusage bool) error { retryExitCode, err = wrapSubprocessErrorWithSourceLoc(retryCommand, env.run(retryCommand, getStdin(), retryStdoutBuffer, retryStderrBuffer)) return err |