]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/vendor/github.com/google/pprof: cherry-pick fix to cope with $HOME not being...
authorMichael Hudson-Doyle <michael.hudson@canonical.com>
Tue, 30 Jan 2018 22:11:39 +0000 (11:11 +1300)
committerMichael Hudson-Doyle <michael.hudson@canonical.com>
Wed, 31 Jan 2018 00:49:35 +0000 (00:49 +0000)
Upstream PRs: https://github.com/google/pprof/pull/305,
https://github.com/google/pprof/pull/306.

Change-Id: I28969118f52ee08fcaf3572ad5da015ae756fd7a
Reviewed-on: https://go-review.googlesource.com/90935
Run-TryBot: Michael Hudson-Doyle <michael.hudson@canonical.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/cmd/vendor/github.com/google/pprof/internal/driver/fetch_test.go

index 32af2e9b20729fdbcb99138fa22905319c9a4952..abce5b5c70c52b339f57193209ceaf96f46dfd8f 100644 (file)
@@ -362,6 +362,18 @@ func TestHttpsInsecure(t *testing.T) {
        if runtime.GOOS == "nacl" {
                t.Skip("test assumes tcp available")
        }
+       saveHome := os.Getenv(homeEnv())
+       tempdir, err := ioutil.TempDir("", "home")
+       if err != nil {
+               t.Fatal("creating temp dir: ", err)
+       }
+       defer os.RemoveAll(tempdir)
+
+       // pprof writes to $HOME/pprof by default which is not necessarily
+       // writeable (e.g. on a Debian buildd) so set $HOME to something we
+       // know we can write to for the duration of the test.
+       os.Setenv(homeEnv(), tempdir)
+       defer os.Setenv(homeEnv(), saveHome)
 
        baseVars := pprofVariables
        pprofVariables = baseVars.makeCopy()