Updates golang.org/x/net/route to rev fac978c for:
- route: fix typos in test

Change-Id: I35de1d3f8e887c6bb5fe50e7299f2fc12e4426de
Reviewed-on: https://go-review.googlesource.com/23660
Reviewed-by: Ian Lance Taylor <iant@golang.org>

misc/android/go_android_exec.go

@@ -91,11 +91,11 @@ func main() {

	run("shell", "rm", "-rf", deviceGotmp) // Clean up.

	output = output[strings.LastIndex(output, "\n")+1:]
	if !strings.HasPrefix(output, exitstr) {
	exitIdx := strings.LastIndex(output, exitstr)
	if exitIdx == -1 {
		log.Fatalf("no exit code: %q", output)
	}
	code, err := strconv.Atoi(output[len(exitstr):])
	code, err := strconv.Atoi(output[exitIdx+len(exitstr):])
	if err != nil {
		log.Fatalf("bad exit code: %v", err)
	}

misc/cgo/errors/issue13830.go

@@ -0,0 +1,26 @@
// Copyright 2016 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.

// cgo converts C void* to Go unsafe.Pointer, so despite appearances C
// void** is Go *unsafe.Pointer. This test verifies that we detect the
// problem at build time.

package main

// typedef void v;
// void F(v** p) {}
import "C"

import "unsafe"

type v [0]byte

func f(p **v) {
	C.F((**C.v)(unsafe.Pointer(p))) // ERROR HERE
}

func main() {
	var p *v
	f(&p)
}

misc/cgo/errors/ptr.go

@@ -314,6 +314,14 @@ var ptrTests = []ptrTest{
		body:    `i := 0; p := S{u:uintptr(unsafe.Pointer(&i))}; q := (*S)(C.malloc(C.size_t(unsafe.Sizeof(p)))); *q = p; C.f(unsafe.Pointer(q))`,
		fail:    false,
	},
	{
		// Check deferred pointers when they are used, not
		// when the defer statement is run.
		name: "defer",
		c:    `typedef struct s { int *p; } s; void f(s *ps) {}`,
		body: `p := &C.s{}; defer C.f(p); p.p = new(C.int)`,
		fail: true,
	},
}

func main() {

misc/cgo/errors/test.bash

@@ -18,16 +18,16 @@ expect() {
	file=$1
	shift
	if go build $file >errs 2>&1; then
		echo 1>&2 misc/cgo/errors/test.bash: BUG: expected cgo to fail but it succeeded
		echo 1>&2 misc/cgo/errors/test.bash: BUG: expected cgo to fail on $file but it succeeded
		exit 1
	fi
	if ! test -s errs; then
		echo 1>&2 misc/cgo/errors/test.bash: BUG: expected error output but saw none
		echo 1>&2 misc/cgo/errors/test.bash: BUG: expected error output for $file but saw none
		exit 1
	fi
	for error; do
		if ! fgrep $error errs >/dev/null 2>&1; then
			echo 1>&2 misc/cgo/errors/test.bash: BUG: expected error output to contain \"$error\" but saw:
			echo 1>&2 misc/cgo/errors/test.bash: BUG: expected error output for $file to contain \"$error\" but saw:
			cat 1>&2 errs
			exit 1
		fi
@@ -44,6 +44,7 @@ check issue11097b.go
expect issue13129.go C.ushort
check issue13423.go
expect issue13635.go C.uchar C.schar C.ushort C.uint C.ulong C.longlong C.ulonglong C.complexfloat C.complexdouble
check issue13830.go

if ! go build issue14669.go; then
	exit 1

misc/cgo/test/cthread.go

@@ -8,6 +8,7 @@ package cgotest
import "C"

import (
	"runtime"
	"sync"
	"testing"
)
@@ -30,6 +31,9 @@ func Add(x int) {
}

func testCthread(t *testing.T) {
	if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
		t.Skip("the iOS exec wrapper is unable to properly handle the panic from Add")
	}
	sum.i = 0
	C.doAdd(10, 6)

misc/cgo/test/issue7978.go

@@ -103,7 +103,7 @@ func test7978(t *testing.T) {
	if C.HAS_SYNC_FETCH_AND_ADD == 0 {
		t.Skip("clang required for __sync_fetch_and_add support on darwin/arm")
	}
	if runtime.GOOS == "android" {
	if runtime.GOOS == "android" || runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
		t.Skip("GOTRACEBACK is not passed on to the exec wrapper")
	}
	if os.Getenv("GOTRACEBACK") != "2" {

misc/cgo/test/issue9400/asm_386.s

@@ -7,17 +7,18 @@
#include "textflag.h"

TEXT ·RewindAndSetgid(SB),NOSPLIT,$0-0
	MOVL	$·Baton(SB), BX
	// Rewind stack pointer so anything that happens on the stack
	// will clobber the test pattern created by the caller
	ADDL	$(1024 * 8), SP

	// Ask signaller to setgid
	MOVL	$1, ·Baton(SB)
	MOVL	$1, (BX)

	// Wait for setgid completion
loop:
	PAUSE
	MOVL	·Baton(SB), AX
	MOVL	(BX), AX
	CMPL	AX, $0
	JNE	loop

misc/cgo/testsanitizers/test.bash

@@ -111,61 +111,52 @@ if test "$tsan" = "yes"; then
     rm -f ${TMPDIR}/testsanitizers$$*
fi

if test "$tsan" = "yes"; then
# Run a TSAN test.
# $1 test name
# $2 environment variables
# $3 go run args
testtsan() {
    err=${TMPDIR}/tsanerr$$.out

    if ! go run tsan.go 2>$err; then
    if ! env $2 go run $3 $1 2>$err; then
	cat $err
	echo "FAIL: tsan"
	echo "FAIL: $1"
	status=1
    elif grep -i warning $err >/dev/null 2>&1; then
	cat $err
	echo "FAIL: tsan"
	status=1
    fi

    if ! go run tsan2.go 2>$err; then
	cat $err
	echo "FAIL: tsan2"
	status=1
    elif grep -i warning $err >/dev/null 2>&1; then
	cat $err
	echo "FAIL: tsan2"
	echo "FAIL: $1"
	status=1
    fi
    rm -f $err
}

    if ! go run tsan3.go 2>$err; then
	cat $err
	echo "FAIL: tsan3"
	status=1
    elif grep -i warning $err >/dev/null 2>&1; then
	cat $err
	echo "FAIL: tsan3"
	status=1
if test "$tsan" = "yes"; then
    testtsan tsan.go
    testtsan tsan2.go
    testtsan tsan3.go
    testtsan tsan4.go

    # These tests are only reliable using clang or GCC version 7 or later.
    # Otherwise runtime/cgo/libcgo.h can't tell whether TSAN is in use.
    ok=false
    if ${CC} --version | grep clang >/dev/null 2>&1; then
	ok=true
    else
	ver=$($CC -dumpversion)
	major=$(echo $ver | sed -e 's/\([0-9]*\).*/\1/')
	if test "$major" -lt 7; then
	    echo "skipping remaining TSAN tests: GCC version $major (older than 7)"
	else
	    ok=true
	fi
    fi

    if ! go run tsan4.go 2>$err; then
	cat $err
	echo "FAIL: tsan4"
	status=1
    elif grep -i warning $err >/dev/null 2>&1; then
	cat $err
	echo "FAIL: tsan4"
	status=1
    fi
    if test "$ok" = "true"; then
	# This test requires rebuilding os/user with -fsanitize=thread.
	testtsan tsan5.go "CGO_CFLAGS=-fsanitize=thread CGO_LDFLAGS=-fsanitize=thread" "-installsuffix=tsan"

    # This test requires rebuilding os/user with -fsanitize=thread.
    if ! CGO_CFLAGS="-fsanitize=thread" CGO_LDFLAGS="-fsanitize=thread" go run -installsuffix=tsan tsan5.go 2>$err; then
	cat $err
	echo "FAIL: tsan5"
	status=1
    elif grep -i warning $err >/dev/null 2>&1; then
	cat $err
	echo "FAIL: tsan5"
	status=1
	# This test requires rebuilding runtime/cgo with -fsanitize=thread.
	testtsan tsan6.go "CGO_CFLAGS=-fsanitize=thread CGO_LDFLAGS=-fsanitize=thread" "-installsuffix=tsan"
    fi

    rm -f $err
fi

exit $status

misc/cgo/testsanitizers/tsan6.go

@@ -0,0 +1,49 @@
// Copyright 2016 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 main

// Check that writes to Go allocated memory, with Go synchronization,
// do not look like a race.

/*
#cgo CFLAGS: -fsanitize=thread
#cgo LDFLAGS: -fsanitize=thread

void f(char *p) {
	*p = 1;
}
*/
import "C"

import (
	"runtime"
	"sync"
)

func main() {
	var wg sync.WaitGroup
	var mu sync.Mutex
	c := make(chan []C.char, 100)
	for i := 0; i < 10; i++ {
		wg.Add(2)
		go func() {
			defer wg.Done()
			for i := 0; i < 100; i++ {
				c <- make([]C.char, 4096)
				runtime.Gosched()
			}
		}()
		go func() {
			defer wg.Done()
			for i := 0; i < 100; i++ {
				p := &(<-c)[0]
				mu.Lock()
				C.f(p)
				mu.Unlock()
			}
		}()
	}
	wg.Wait()
}

misc/cgo/testshared/src/depBase/dep.go

@@ -12,6 +12,11 @@ type Dep struct {
	X int
}

func (d *Dep) Method() int {
	return 10
}

func F() int {
	defer func() {}()
	return V
}

misc/cgo/testshared/src/exe2/exe2.go

@@ -3,5 +3,6 @@ package main
import "dep2"

func main() {
	dep2.W = dep2.G() + 1
	d := &dep2.Dep2{}
	dep2.W = dep2.G() + 1 + d.Method()
}