From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 7 Aug 2018 17:28:22 +0000 (+0000)
Subject: libgo: uncomment trace.Stop() call in testing package
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9be4d77249fcba6baead6e27cdb2447d4e6039fa;p=gcc.git

libgo: uncomment trace.Stop() call in testing package

    Fix up the testing package to insure that execution traces
    work properly (e.g. "-test.trace=<XXX>" command line option). The
    call to stop tracing and emit the output file was stubbed out.

    Reviewed-on: https://go-review.googlesource.com/128275

From-SVN: r263363
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 776a0a8c893..51098e77954 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-8997a3afcc746824cb70b48b32d9c86b4814807d
+274c88df4d6f9360dcd657b6e069a3b5a1d37a90
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/testing/testing.go b/libgo/go/testing/testing.go
index f39d5ef155c..f56dbf8f6d6 100644
--- a/libgo/go/testing/testing.go
+++ b/libgo/go/testing/testing.go
@@ -1159,7 +1159,7 @@ func (m *M) writeProfiles() {
 		m.deps.StopCPUProfile() // flushes profile to disk
 	}
 	if *traceFile != "" {
-		// trace.Stop() // flushes trace to disk
+		trace.Stop() // flushes trace to disk
 	}
 	if *memProfile != "" {
 		f, err := os.Create(toOutputDir(*memProfile))