You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/03/24 12:53:13 UTC
[3/3] lucy git commit: Fix test_all.sh script for newer Go versions
Fix test_all.sh script for newer Go versions
When cleaning the CFC build before building the Clownfish runtime and
Lucy, I get an error with Go 1.5 because "CFC.h" could not be found.
I'm not sure what's at play here. Cleaning the CFC build afterwards
is only a band-aid. This needs some further investigation.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/94c6aa2e
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/94c6aa2e
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/94c6aa2e
Branch: refs/heads/master
Commit: 94c6aa2ea3a649ceb5a1dcab9a5df24239600914
Parents: 56e7c20
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Mar 24 12:16:37 2016 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Thu Mar 24 12:52:37 2016 +0100
----------------------------------------------------------------------
devel/bin/test_all.sh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/94c6aa2e/devel/bin/test_all.sh
----------------------------------------------------------------------
diff --git a/devel/bin/test_all.sh b/devel/bin/test_all.sh
index c5c94b6..54fc496 100755
--- a/devel/bin/test_all.sh
+++ b/devel/bin/test_all.sh
@@ -52,7 +52,11 @@ set -x
rm -rf "$tmp_dir"
if [ -z "$1" -o "$1" = go ]; then
- export GOPATH="$tmp_dir/go:$GOPATH"
+ if [ -z "$GOPATH" ]; then
+ export GOPATH="$tmp_dir/go"
+ else
+ export GOPATH="$tmp_dir/go:$GOPATH"
+ fi
mkdir -p "$tmp_dir/go/src/git-wip-us.apache.org/repos/asf"
ln -s "$cfish_dir" \
"$tmp_dir/go/src/git-wip-us.apache.org/repos/asf/lucy-clownfish.git"
@@ -62,15 +66,18 @@ if [ -z "$1" -o "$1" = go ]; then
cd "$cfish_dir/compiler/go"
go run build.go test
go run build.go install
- go run build.go clean
cd ../../runtime/go
go run build.go test
go run build.go install
- go run build.go clean
cd "$lucy_dir/go"
go run build.go test
+
+ go run build.go clean
+ cd "$cfish_dir/runtime/go"
+ go run build.go clean
+ cd "$cfish_dir/compiler/go"
go run build.go clean
cd "$root"