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

Move temporary data during test runts into the out/ directory to keep the working directory clean.

This commit is contained in:
Willi Goesgens 2015-06-25 17:20:48 +02:00
parent b652628b27
commit fcc64191fe
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/run
View File

@ -36,8 +36,9 @@ for i in "$@"; do
ARGS+=("$i") ARGS+=("$i")
fi fi
done done
echo Database has its data in data-$PID mkdir out
echo Logfile is in log-$PID echo Database has its data in out${PS}data-$PID
echo Logfile is in out${PS}log-$PID
$VG bin/arangod \ $VG bin/arangod \
--configuration none \ --configuration none \
--cluster.agent-path bin${PS}etcd-arango${EXT} \ --cluster.agent-path bin${PS}etcd-arango${EXT} \
@ -48,8 +49,8 @@ $VG bin/arangod \
--cluster.disable-dispatcher-kickstarter false \ --cluster.disable-dispatcher-kickstarter false \
--cluster.data-path cluster \ --cluster.data-path cluster \
--cluster.log-path cluster \ --cluster.log-path cluster \
--database.directory data-$PID \ --database.directory out${PS}data-$PID \
--log.file log-$PID \ --log.file out${PS}log-$PID \
--server.endpoint tcp://127.0.0.1:$PORT \ --server.endpoint tcp://127.0.0.1:$PORT \
--javascript.startup-directory js \ --javascript.startup-directory js \
--javascript.app-path js${PS}apps \ --javascript.app-path js${PS}apps \
@ -60,11 +61,11 @@ $VG bin/arangod \
$VXML $VXML
if test $? -eq 0; then if test $? -eq 0; then
echo removing log-$PID data-$PID echo removing out${PS}log-$PID out${PS}data-$PID
rm -rf log-$PID data-$PID rm -rf out${PS}log-$PID out${PS}data-$PID
else else
echo "failed - don't remove log-$PID data-$PID - heres the logfile:" echo "failed - don't remove out${PS}log-$PID out${PS}data-$PID - heres the logfile:"
cat log-$PID cat out${PS}log-$PID
fi fi
echo Server has terminated. echo Server has terminated.

6
scripts/unittest.js
View File

@ -156,11 +156,11 @@ function main (argv) {
print(JSON.stringify(r)); print(JSON.stringify(r));
} }
fs.write("UNITTEST_RESULT.json", JSON.stringify(r)); fs.write("out/UNITTEST_RESULT.json", JSON.stringify(r));
fs.write("UNITTEST_RESULT_SUMMARY.txt", JSON.stringify(! r.crashed)); fs.write("out/UNITTEST_RESULT_SUMMARY.txt", JSON.stringify(! r.crashed));
try { try {
resultsToXml(r, "UNITTEST_RESULT_", (options.hasOwnProperty('cluster') && options.cluster)); resultsToXml(r, "out/UNITTEST_RESULT_", (options.hasOwnProperty('cluster') && options.cluster));
} }
catch (x) { catch (x) {
print("exception while serializing status xml!"); print("exception while serializing status xml!");