]> Cypherpunks repositories - gostls13.git/commitdiff
misc/swig/callback: fix test for SWIG -cgo support
authorIan Lance Taylor <iant@golang.org>
Fri, 6 Mar 2015 03:58:27 +0000 (19:58 -0800)
committerIan Lance Taylor <iant@golang.org>
Fri, 6 Mar 2015 15:28:50 +0000 (15:28 +0000)
The test used to import ../callback.  I forget why that ever worked,
but it probably had something to do with the shared libraries we used
to use with SWIG.  It doesn't work today.

Change-Id: Ib83d6c398aa46bf2fc66320b47b6e6d9897ee0b7
Reviewed-on: https://go-review.googlesource.com/7004
Reviewed-by: David Crawshaw <crawshaw@golang.org>
misc/swig/callback/callback_test.go

index cf008fb540ea5dd5c423f09c8363ec07b964fc52..dbbbab5760e2959e1a889697ef706cbdfe25d5f1 100644 (file)
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package callback_test
+package callback
 
 import (
-       "../callback"
        "testing"
 )
 
 func TestCall(t *testing.T) {
-       c := callback.NewCaller()
-       cb := callback.NewCallback()
+       c := NewCaller()
+       cb := NewCallback()
 
        c.SetCallback(cb)
        s := c.Call()
@@ -22,13 +21,13 @@ func TestCall(t *testing.T) {
 }
 
 func TestCallback(t *testing.T) {
-       c := callback.NewCaller()
-       cb := callback.NewDirectorCallback(&callback.GoCallback{})
+       c := NewCaller()
+       cb := NewDirectorCallback(&GoCallback{})
        c.SetCallback(cb)
        s := c.Call()
        if s != "GoCallback.Run" {
                t.Errorf("unexpected string from Call with callback: %q", s)
        }
        c.DelCallback()
-       callback.DeleteDirectorCallback(cb)
+       DeleteDirectorCallback(cb)
 }