lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [2/2] lucy git commit: Fix test_all.sh script for newer Go versions
Date Thu, 24 Mar 2016 11:36:27 GMT
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/6ca06370
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6ca06370
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6ca06370

Branch: refs/heads/0.5
Commit: 6ca063705ea8c4140ba6cdfe548eced9cf5edda0
Parents: c611622
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Thu Mar 24 12:16:37 2016 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Thu Mar 24 12:16: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/6ca06370/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"


Mime
View raw message