diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-05 09:24:44 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-05 09:24:44 +0000 |
| commit | 55c4b664c2b65a2a346b55beec474e0404634c18 (patch) | |
| tree | 3b804fec819d027d915850ec88821f23ed5538ea /libgo/testsuite | |
| parent | 3af4a6046ed483eb5301a47290e40328d40f954c (diff) | |
| download | gcc-55c4b664c2b65a2a346b55beec474e0404634c18.tar.gz | |
2011-12-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 182001 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@182003 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/testsuite')
| -rw-r--r-- | libgo/testsuite/Makefile.in | 1 | ||||
| -rwxr-xr-x | libgo/testsuite/gotest | 3 |
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) |