summaryrefslogtreecommitdiff
path: root/libgo/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'libgo/testsuite')
-rw-r--r--libgo/testsuite/Makefile.in1
-rwxr-xr-xlibgo/testsuite/gotest3
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/testsuite/Makefile.in b/libgo/testsuite/Makefile.in
index 21a749276d7..c7e35057074 100644
--- a/libgo/testsuite/Makefile.in
+++ b/libgo/testsuite/Makefile.in
@@ -169,6 +169,7 @@ exec_prefix = @exec_prefix@
glibgo_prefixdir = @glibgo_prefixdir@
glibgo_toolexecdir = @glibgo_toolexecdir@
glibgo_toolexeclibdir = @glibgo_toolexeclibdir@
+go_include = @go_include@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 1dedaa8e361..3a78afee59e 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -346,7 +346,6 @@ localname() {
echo 'import "./_xtest_"'
fi
echo 'import "testing"'
- echo 'import __os__ "os"' # rename in case tested package is called os
echo 'import __regexp__ "regexp"' # rename in case tested package is called regexp
# test array
echo
@@ -385,7 +384,7 @@ localname() {
var matchPat string
var matchRe *__regexp__.Regexp
-func matchString(pat, str string) (result bool, err __os__.Error) {
+func matchString(pat, str string) (result bool, err error) {
if matchRe == nil || matchPat != pat {
matchPat = pat
matchRe, err = __regexp__.Compile(matchPat)