Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add another directory to detect arangosh

This commit is contained in:
Wilfried Goesgens 2017-02-08 11:00:50 +01:00
parent ad1c7e7c13
commit 9dffdbe3f2
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/unittest
View File

@ -2,12 +2,12 @@
export PID=$$ export PID=$$
if test -n "$ORIGINAL_PATH"; then if test -n "$ORIGINAL_PATH"; then
# running in cygwin... # running in cygwin...
PS='\' PS='\'
export EXT=".exe" export EXT=".exe"
else else
export EXT="" export EXT=""
PS='/' PS='/'
fi; fi;
ulimit -n 2048 ulimit -n 2048
@ -15,20 +15,23 @@ ulimit -n 2048
export PORT=`expr 1024 + $RANDOM` export PORT=`expr 1024 + $RANDOM`
if [ -z "${ARANGOSH}" ]; then if [ -z "${ARANGOSH}" ]; then
if [ -x build/bin/arangosh ]; then if [ -x build/bin/arangosh ]; then
ARANGOSH=build/bin/arangosh ARANGOSH=build/bin/arangosh
elif [ -x bin/arangosh ]; then elif [ -x bin/arangosh ]; then
ARANGOSH=bin/arangosh ARANGOSH=bin/arangosh
else elif [ -x usr/bin/arangosh ]; then
echo "$0: cannot locate arangosh" ARANGOSH=usr/bin/arangosh
fi else
echo "$0: cannot locate arangosh"
exit 1
fi
fi fi
# #
exec $ARANGOSH \ exec $ARANGOSH \
-c etc${PS}relative${PS}arangosh.conf \ -c etc${PS}relative${PS}arangosh.conf \
--log.level warning \ --log.level warning \
--server.endpoint tcp://127.0.0.1:${PORT} \ --server.endpoint tcp://127.0.0.1:${PORT} \
--javascript.execute UnitTests${PS}unittest.js \ --javascript.execute UnitTests${PS}unittest.js \
-- \ -- \
"$@" "$@"