f8d9fa9e80
This upgrades all of libgo other than the runtime package to the Go 1.4 release. In Go 1.4 much of the runtime was rewritten into Go. Merging that code will take more time and will not change the API, so I'm putting it off for now. There are a few runtime changes anyhow, to accomodate other packages that rely on minor modifications to the runtime support. The compiler changes slightly to add a one-bit flag to each type descriptor kind that is stored directly in an interface, which for gccgo is currently only pointer types. Another one-bit flag (gcprog) is reserved because it is used by the gc compiler, but gccgo does not currently use it. There is another error check in the compiler since I ran across it during testing. gotools/: * Makefile.am (go_cmd_go_files): Sort entries. Add generate.go. * Makefile.in: Rebuild. From-SVN: r219627
54 lines
1.1 KiB
Go
54 lines
1.1 KiB
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package net
|
|
|
|
import (
|
|
"bufio"
|
|
"os"
|
|
"runtime"
|
|
"testing"
|
|
)
|
|
|
|
func TestReadLine(t *testing.T) {
|
|
// /etc/services file does not exist on android, plan9, windows.
|
|
switch runtime.GOOS {
|
|
case "android", "plan9", "windows":
|
|
t.Skipf("skipping test on %q", runtime.GOOS)
|
|
}
|
|
filename := "/etc/services" // a nice big file
|
|
|
|
fd, err := os.Open(filename)
|
|
if err != nil {
|
|
t.Fatalf("open %s: %v", filename, err)
|
|
}
|
|
defer fd.Close()
|
|
br := bufio.NewReader(fd)
|
|
|
|
file, err := open(filename)
|
|
if file == nil {
|
|
t.Fatalf("net.open(%s) = nil", filename)
|
|
}
|
|
defer file.close()
|
|
|
|
lineno := 1
|
|
byteno := 0
|
|
for {
|
|
bline, berr := br.ReadString('\n')
|
|
if n := len(bline); n > 0 {
|
|
bline = bline[0 : n-1]
|
|
}
|
|
line, ok := file.readLine()
|
|
if (berr != nil) != !ok || bline != line {
|
|
t.Fatalf("%s:%d (#%d)\nbufio => %q, %v\nnet => %q, %v",
|
|
filename, lineno, byteno, bline, berr, line, ok)
|
|
}
|
|
if !ok {
|
|
break
|
|
}
|
|
lineno++
|
|
byteno += len(line) + 1
|
|
}
|
|
}
|