summaryrefslogtreecommitdiff
path: root/src/pkg/testing
diff options
context:
space:
mode:
authorSergio Luis O. B. Correia <sergio@larces.uece.br>2009-11-23 17:32:51 -0800
committerSergio Luis O. B. Correia <sergio@larces.uece.br>2009-11-23 17:32:51 -0800
commita3d65354b47d85f8316f1011597b3935bead2a7b (patch)
treeb739091738e77c3d0fdbd27f77d22ed0e281dc32 /src/pkg/testing
parent722bfe36428db141c167450fe50d6d0e18d59039 (diff)
downloadgo-a3d65354b47d85f8316f1011597b3935bead2a7b.tar.gz
go: makes it build for the case $GOROOT has whitespaces
the bash scripts and makefiles for building go didn't take into account the fact $GOROOT / $GOBIN could both be directories containing whitespaces, and was not possible to build it in such a situation. this commit adjusts the various makefiles/scripts to make it aware of that possibility, and now it builds successfully when using a path with whitespaces as well. Fixes issue 115. R=rsc, dsymonds1 http://codereview.appspot.com/157067 Committer: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/pkg/testing')
-rw-r--r--src/pkg/testing/Makefile4
-rw-r--r--src/pkg/testing/iotest/Makefile4
-rw-r--r--src/pkg/testing/quick/Makefile4
-rw-r--r--src/pkg/testing/script/Makefile4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/pkg/testing/Makefile b/src/pkg/testing/Makefile
index ffbd11111..64485489e 100644
--- a/src/pkg/testing/Makefile
+++ b/src/pkg/testing/Makefile
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
TARG=testing
GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
regexp.go\
testing.go\
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg
diff --git a/src/pkg/testing/iotest/Makefile b/src/pkg/testing/iotest/Makefile
index a37a9d622..2b9abd4b3 100644
--- a/src/pkg/testing/iotest/Makefile
+++ b/src/pkg/testing/iotest/Makefile
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
TARG=testing/iotest
GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
reader.go\
writer.go\
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/testing/quick/Makefile b/src/pkg/testing/quick/Makefile
index 7e3a354da..0e97f2af2 100644
--- a/src/pkg/testing/quick/Makefile
+++ b/src/pkg/testing/quick/Makefile
@@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
TARG=testing/quick
GOFILES=\
quick.go\
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/testing/script/Makefile b/src/pkg/testing/script/Makefile
index 1b4882d56..2e13aeb2f 100644
--- a/src/pkg/testing/script/Makefile
+++ b/src/pkg/testing/script/Makefile
@@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
TARG=testing/script
GOFILES=\
script.go\
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg