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

attempt to fix travis build status detection

This commit is contained in:
Jan Steemann 2015-10-21 16:56:42 +02:00
parent f083fc3b66
commit 1fa5616b30
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/travisCI/build.sh
View File

@ -30,6 +30,10 @@ echo
echo "$0: testing ArangoDB" echo "$0: testing ArangoDB"
./scripts/unittest all --skipRanges true --skipTimeCritical true --skipSsl true || exit 1 ./scripts/unittest all --skipRanges true --skipTimeCritical true --skipSsl true || exit 1
success=`cat out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json`
if test "$success" == "false"; then
exit 1
fi
echo echo
echo "$0: done" echo "$0: done"

2
scripts/run
View File

@ -67,7 +67,7 @@ if test $? -eq 0; then
echo "removing ${LOGFILE} ${DBDIR}" echo "removing ${LOGFILE} ${DBDIR}"
rm -rf ${LOGFILE} ${DBDIR} rm -rf ${LOGFILE} ${DBDIR}
else else
echo "failed - don't remove ${LOGFILE} ${DBDIR} - heres the logfile:" echo "failed - don't remove ${LOGFILE} ${DBDIR} - here's the logfile:"
cat ${LOGFILE} cat ${LOGFILE}
fi fi

6
scripts/unittest.js
View File

@ -156,9 +156,13 @@ function main (argv) {
print(JSON.stringify(r)); print(JSON.stringify(r));
} }
if (options.writeXmlReport) { // whether or not there was an error
fs.write("out/UNITTEST_RESULT_EXECUTIVE_SUMMARY.json", JSON.stringify(r.all_ok));
if (options.writeXmlReport) {
fs.write("out/UNITTEST_RESULT.json", JSON.stringify(r)); fs.write("out/UNITTEST_RESULT.json", JSON.stringify(r));
// should be renamed to UNITTEST_RESULT_CRASHED, because that's what it actually contains
fs.write("out/UNITTEST_RESULT_SUMMARY.txt", JSON.stringify(! r.crashed)); fs.write("out/UNITTEST_RESULT_SUMMARY.txt", JSON.stringify(! r.crashed));
try { try {