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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-01-29 11:10:58 +01:00
parent 2112d7c1f8 e40d059510
commit a640e56f8a
2 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Basics/win-utils.cpp
View File

@ -558,8 +558,6 @@ void TRI_WindowsEmergencyLog(char const* func, char const* file, int line,
va_list ap;
va_start(ap, fmt);
va_list wva;
va_copy(wva, ap);
TRI_LogWindowsEventlog(func, file, line, fmt, ap);
va_end(wva);
}

73
scripts/run
View File

@ -3,71 +3,56 @@ export PID=$$
self=$0
if test -f "${self}.js"; then
export SCRIPT=${self}.js
export SCRIPT=${self}.js
else
export SCRIPT=$1
shift
export SCRIPT=$1
shift
fi
if test -n "$ORIGINAL_PATH"; then
# running in cygwin...
PS='\'
export EXT=".exe"
PS='\'
export EXT=".exe"
else
export EXT=""
PS='/'
export EXT=""
PS='/'
fi;
LOGFILE="out${PS}log-$PID"
DBDIR="out${PS}data-$PID"
mkdir -p ${DBDIR}
export PORT=`expr 1024 + $RANDOM`
declare -a ARGS
export VG=''
export VXML=''
for i in "$@"; do
# no valgrind on cygwin, don't care.
if test "$i" == valgrind; then
export VG='/usr/bin/valgrind --log-file=/tmp/valgrindlog.%p'
elif test "$i" == valgrindxml; then
export VG='/usr/bin/valgrind --xml=yes --xml-file=valgrind_testrunner'
export VXML="valgrind=\"${VG}\""
export VG=${VG}'.xml '
else
ARGS+=(--javascript.script-parameter)
ARGS+=("$i")
fi
# no valgrind on cygwin, don't care.
if test "$i" == valgrind; then
export VG='/usr/bin/valgrind --log-file=/tmp/valgrindlog.%p'
elif test "$i" == valgrindxml; then
export VG='/usr/bin/valgrind --xml=yes --xml-file=valgrind_testrunner'
export VXML="valgrind=\"${VG}\""
export VG=${VG}'.xml '
else
ARGS+=("$i")
fi
done
echo Database has its data in ${DBDIR}
echo Logfile is in ${LOGFILE}
$VG bin/arangod \
--configuration none \
--cluster.agent-path bin${PS}etcd-arango${EXT} \
--cluster.arangod-path bin${PS}arangod \
--cluster.coordinator-config etc${PS}relative${PS}arangod-coordinator.conf \
--cluster.dbserver-config etc${PS}relative${PS}arangod-dbserver.conf \
--cluster.disable-dispatcher-frontend false \
--cluster.disable-dispatcher-kickstarter false \
--cluster.data-path cluster \
--cluster.log-path cluster \
--database.directory ${DBDIR} \
--log.file ${LOGFILE} \
--server.endpoint tcp://127.0.0.1:$PORT \
--javascript.startup-directory js \
--javascript.app-path js${PS}apps \
--javascript.script $SCRIPT \
--no-server \
--temp-path ${PS}var${PS}tmp \
"${ARGS[@]}" \
$VXML
$VG bin/arangosh \
-c etc${PS}relative${PS}arangosh.conf \
--server.endpoint tcp://127.0.0.1:${PORT} \
--javascript.execute scripts${PS}unittest.js \
-- \
"${ARGS[@]}" \
$VXML
if test $? -eq 0; then
echo "removing ${LOGFILE} ${DBDIR}"
rm -rf ${LOGFILE} ${DBDIR}
echo "removing ${LOGFILE}"
rm -rf ${LOGFILE}
else
echo "failed - don't remove ${LOGFILE} ${DBDIR} - here's the logfile:"
echo "failed - don't remove ${LOGFILE} - here's the logfile:"
cat ${LOGFILE}
fi