Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel

Quickly commit changes in the rebase branch.

1 files changed, 7 insertions, 6 deletions

diff --git a/libgo/go/time/internal_test.go b/libgo/go/time/internal_test.go
index 1e14f6c..70944f9 100644
--- a/libgo/go/time/internal_test.go
+++ b/libgo/go/time/internal_test.go
@@ -72,12 +72,13 @@ func CheckRuntimeTimerOverflow() {
 		resetTimer(r, 0)
 	}()
 
-	// If the test fails, we will hang here until the timeout in the testing package
-	// fires, which is 10 minutes. It would be nice to catch the problem sooner,
-	// but there is no reliable way to guarantee that timerproc schedules without
-	// doing something involving timerproc itself. Previous failed attempts have
-	// tried calling runtime.Gosched and runtime.GC, but neither is reliable.
-	// So we fall back to hope: We hope we don't hang here.
+	// If the test fails, we will hang here until the timeout in the
+	// testing package fires, which is 10 minutes. It would be nice to
+	// catch the problem sooner, but there is no reliable way to guarantee
+	// that timers are run without doing something involving the scheduler.
+	// Previous failed attempts have tried calling runtime.Gosched and
+	// runtime.GC, but neither is reliable. So we fall back to hope:
+	// We hope we don't hang here.
 	<-t.C
 }