diff options
author | Arne Juul <arnej@yahooinc.com> | 2023-04-23 16:46:33 +0000 |
---|---|---|
committer | Arne Juul <arnej@yahooinc.com> | 2023-04-23 16:46:33 +0000 |
commit | ab6c424d596361c4f4e13ed451413a98d9212aae (patch) | |
tree | 622a0fd6fbea32b1696ecd956fdaf7bb5754eba9 /client | |
parent | af9fb6e14901f3320919f5a3887bc00fdecc065b (diff) |
use MatchesListEnv to simplify
Diffstat (limited to 'client')
-rw-r--r-- | client/go/internal/admin/prog/valgrind.go | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/client/go/internal/admin/prog/valgrind.go b/client/go/internal/admin/prog/valgrind.go index 2d7f0a597d9..b949102d6bd 100644 --- a/client/go/internal/admin/prog/valgrind.go +++ b/client/go/internal/admin/prog/valgrind.go @@ -21,25 +21,18 @@ const ( func (p *Spec) ConfigureValgrind() { p.shouldUseValgrind = false p.shouldUseCallgrind = false - env := p.Getenv(envvars.VESPA_USE_VALGRIND) - allValgrind := env == "all" - parts := strings.Split(env, " ") - for _, part := range parts { - if p.BaseName == part || allValgrind { - trace.Trace("using valgrind as", p.Program, "has basename in", envvars.VESPA_USE_VALGRIND, "=>", env) - backticks := util.BackTicksWithStderr - out, err := backticks.Run(VALGRIND_PROG, "--help") - if err != nil { - trace.Trace("trial run of valgrind fails:", err, "=>", out) - return - } - if opts := p.Getenv(envvars.VESPA_VALGRIND_OPT); strings.Contains(opts, "callgrind") { - p.shouldUseCallgrind = true - } - p.shouldUseValgrind = true + if p.MatchesListEnv(envvars.VESPA_USE_VALGRIND) { + trace.Trace("using valgrind as", p.Program, "has basename in", envvars.VESPA_USE_VALGRIND) + backticks := util.BackTicksWithStderr + out, err := backticks.Run(VALGRIND_PROG, "--help") + if err != nil { + trace.Trace("trial run of valgrind fails:", err, "=>", out) return } - trace.Debug("checking", envvars.VESPA_USE_VALGRIND, ":", p.BaseName, "!=", part) + if opts := p.Getenv(envvars.VESPA_VALGRIND_OPT); strings.Contains(opts, "callgrind") { + p.shouldUseCallgrind = true + } + p.shouldUseValgrind = true } } |