aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-08-07 17:28:22 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-08-07 17:28:22 +0000
commit9be4d77249fcba6baead6e27cdb2447d4e6039fa (patch)
treefff7c9af726d4d0a43069e1c830b095a5af8bf34
parent4663b943c6eec1006f160dbec0729511bc5d1838 (diff)
downloadgcc-9be4d77249fcba6baead6e27cdb2447d4e6039fa.zip
gcc-9be4d77249fcba6baead6e27cdb2447d4e6039fa.tar.gz
gcc-9be4d77249fcba6baead6e27cdb2447d4e6039fa.tar.bz2
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
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/testing/testing.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 776a0a8..51098e7 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 f39d5ef..f56dbf8 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))