misc/cgo: re-enable testso

Also enabled it for darwin.

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

diff --git a/misc/cgo/testso/Makefile b/misc/cgo/testso/Makefile
deleted file mode 100644 (file)
index e472cf2..0000000
--- a/misc/cgo/testso/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2011 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.
-
-include ../../../src/Make.inc
-
-TARG=cgosotest
-
-CGO_DEPS+=libcgoso.so
-CGO_LDFLAGS+=-lcgoso -L.
-CLEANFILES+=out libcgoso.so
-CGOFILES=\
-       cgoso.go\
-
-include ../../../src/Make.pkg
-
-libcgoso.so: cgoso_c.c
-       gcc cgoso_c.c -fPIC -o $@ $(_CGO_CFLAGS_$(GOARCH)) $(_CGO_LDFLAGS_$(GOOS))
-
-out: install main.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) main.go
-       $(LD) -o $@ main.$O

diff --git a/misc/cgo/testso/cgoso_test.go b/misc/cgo/testso/cgoso_test.go
new file mode 100644 (file)
index 0000000..6eddb90
--- /dev/null
+++ b/misc/cgo/testso/cgoso_test.go
@@ -0,0 +1,7 @@
+package cgosotest
+
+import (
+       "testing"
+)
+
+func TestCgoSo(t *testing.T) { Test() }

diff --git a/misc/cgo/testso/main.go b/misc/cgo/testso/main.go
deleted file mode 100644 (file)
index 672ab26..0000000
--- a/misc/cgo/testso/main.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2011 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
-
-import "cgosotest"
-
-func main() {
-       cgosotest.Test()
-}

diff --git a/misc/cgo/testso/test.bash b/misc/cgo/testso/test.bash
deleted file mode 100755 (executable)
index f275eb5..0000000
--- a/misc/cgo/testso/test.bash
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Copyright 2011 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.
-
-set -e
-gomake out
-LD_LIBRARY_PATH=. ./out
-gomake clean

diff --git a/src/run.bash b/src/run.bash
index b5ffaa9974d9b2584cc8702c2e0d4c76688b1309..c6f02e303abaa1863bc3b32c01b324be4c3b8356 100755 (executable)
--- a/src/run.bash
+++ b/src/run.bash
@@ -57,13 +57,10 @@ BROKEN=true
 go test
 ) || exit $?
 
-$BROKEN ||
 [ "$CGO_ENABLED" != 1 ] ||
 [ "$GOHOSTOS" == windows ] ||
-[ "$GOHOSTOS" == darwin ] ||
 (xcd ../misc/cgo/testso
-"$GOMAKE" clean
-./test.bash
+go test
 ) || exit $?
 
 (xcd ../doc/progs