delete all uses of panicln by rewriting them using panic or,

in the tests, println+panic.
gofmt some tests too.

R=rsc
CC=golang-dev
https://golang.org/cl/741041

1 files changed, 31 insertions, 22 deletions

diff --git a/test/range.go b/test/range.go
index 48237a715e..9093d714bc 100644
--- a/test/range.go
+++ b/test/range.go
@@ -10,46 +10,50 @@ package main
 
 func gen(c chan int, lo, hi int) {
 	for i := lo; i <= hi; i++ {
-		c <- i;
+		c <- i
 	}
-	close(c);
+	close(c)
 }
 
 func seq(lo, hi int) chan int {
-	c := make(chan int);
-	go gen(c, lo, hi);
-	return c;
+	c := make(chan int)
+	go gen(c, lo, hi)
+	return c
 }
 
 func testchan() {
-	s := "";
+	s := ""
 	for i := range seq('a', 'z') {
-		s += string(i);
+		s += string(i)
 	}
 	if s != "abcdefghijklmnopqrstuvwxyz" {
-		panicln("Wanted lowercase alphabet; got", s);
+		println("Wanted lowercase alphabet; got", s)
+		panic("fail")
 	}
 }
 
 // test that range over array only evaluates
 // the expression after "range" once.
 
-var nmake = 0;
+var nmake = 0
+
 func makearray() []int {
-	nmake++;
-	return []int{1,2,3,4,5};
+	nmake++
+	return []int{1, 2, 3, 4, 5}
 }
 
 func testarray() {
-	s := 0;
+	s := 0
 	for _, v := range makearray() {
-		s += v;
+		s += v
 	}
 	if nmake != 1 {
-		panicln("range called makearray", nmake, "times");
+		println("range called makearray", nmake, "times")
+		panic("fail")
 	}
 	if s != 15 {
-		panicln("wrong sum ranging over makearray");
+		println("wrong sum ranging over makearray")
+		panic("fail")
 	}
 }
 
@@ -57,6 +61,7 @@ func testarray() {
 // exactly once per iteration.
 
 var ncalls = 0
+
 func getvar(p *int) *int {
 	ncalls++
 	return p
@@ -71,23 +76,27 @@ func testcalls() {
 		sv += v
 	}
 	if ncalls != 4 {
-		panicln("wrong number of calls:", ncalls, "!= 4")
+		println("wrong number of calls:", ncalls, "!= 4")
+		panic("fail")
 	}
 	if si != 1 || sv != 3 {
-		panicln("wrong sum in testcalls", si, sv)
+		println("wrong sum in testcalls", si, sv)
+		panic("fail")
 	}
 
 	ncalls = 0
 	for *getvar(&i), *getvar(&v) = range [0]int{} {
-		panicln("loop ran on empty array")
+		println("loop ran on empty array")
+		panic("fail")
 	}
 	if ncalls != 0 {
-		panicln("wrong number of calls:", ncalls, "!= 0")
+		println("wrong number of calls:", ncalls, "!= 0")
+		panic("fail")
 	}
 }
 
 func main() {
-	testchan();
-	testarray();
-	testcalls();
+	testchan()
+	testarray()
+	testcalls()
 }