Go: fix search and tool paths for 'make test'

Author: cklin

go/extractor-smoke-test/test.sh

@@ -7,7 +7,7 @@ cd $DIR
 
 rm -rf testdb
 
-codeql database create --language=go testdb --search-path ..
+codeql database create --language=go testdb --search-path ../build/codeql-extractor-go
 codeql dataset check testdb/db-go
 codeql query run ../ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.ql --database=testdb --output=notracing-out.bqrs --search-path ..
 codeql bqrs decode notracing-out.bqrs --format=csv --output=notracing-out.csv
@@ -19,7 +19,7 @@ export CODEQL_EXTRACTOR_GO_BUILD_TRACING=on
 
 rm -rf testdb
 
-codeql database create --language=go testdb --search-path ..
+codeql database create --language=go testdb --search-path ../build/codeql-extractor-go
 codeql dataset check testdb/db-go
 codeql query run ../ql/test/library-tests/semmle/go/controlflow/ControlFlowGraph/ControlFlowNode_getASuccessor.ql --database=testdb --output=tracing-out.bqrs --search-path ..
 codeql bqrs decode tracing-out.bqrs --format=csv --output=tracing-out.csv

go/tools/utils.sh

@@ -4,7 +4,7 @@ if [ -z "$SEMMLE_PLATFORM" ]
 then
     case "$OSTYPE" in
     linux*)     SEMMLE_PLATFORM="linux";;
-    darwin*)    SEMMLE_PLATFORM="osx";;
+    darwin*)    SEMMLE_PLATFORM="osx64";;
     msys*)      SEMMLE_PLATFORM="win";;
     *)          echo "This script only works on Linux, macOS and msys; OSTYPE: $OSTYPE" && exit 1
     esac
@@ -20,5 +20,5 @@ fi
 run() {
     cmd=$1
     shift
-    "$SCRIPTDIR/platform/$SEMMLE_PLATFORM/bin/$cmd$EXE" "$@"
+    "$SCRIPTDIR/$SEMMLE_PLATFORM/$cmd$EXE" "$@"
 }