sort: remove testing cycle

import cycle:
        "testing"
        imports "flag"
        imports "sort"
        imports "testing"

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/4811048

src/pkg/sort/search_test.go

@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package sort
+package sort_test
 
-import "testing"
+import (
+	. "sort"
+	"testing"
+)
 
 func f(a []int, x int) func(int) bool {
 	return func(i int) bool {

src/pkg/sort/sort_test.go

@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package sort
+package sort_test
 
 import (
 	"fmt"
 	"rand"
+	. "sort"
 	"strconv"
 	"testing"
 )
@@ -271,3 +272,10 @@ func TestBentleyMcIlroy(t *testing.T) {
 		}
 	}
 }
+
+func min(a, b int) int {
+	if a < b {
+		return a
+	}
+	return b
+}