From cf72047b30fc183e5f30f613f44bf0c808d118c0 Mon Sep 17 00:00:00 2001
From: Willi Goesgens <willi@arangodb.com>
Date: Thu, 25 Sep 2014 15:47:02 +0200
Subject: [PATCH] Catch exceptions from testing.js

---
 scripts/unittest.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/unittest.js b/scripts/unittest.js
index 80aed51d70..661fe86b91 100644
--- a/scripts/unittest.js
+++ b/scripts/unittest.js
@@ -81,13 +81,22 @@ function main (argv) {
   }
   var test = argv[1];
   var options = {};
+  var r;
   if (argv.length >= 3) {
     options = JSON.parse(argv[2]);
   }
   options.jsonReply = true;
   var UnitTest = require("org/arangodb/testing");
   start_pretty_print();
-  var r = UnitTest.UnitTest(test,options); 
+
+  try {
+    r = UnitTest.UnitTest(test,options); 
+  }
+  catch (x) {
+    print("Caught exception during test execution!");
+    print(x.message);
+    print(JSON.stringify(r);
+  }
   fs.write("UNITTEST_RESULT.json",JSON.stringify(r));
   fs.write("UNITTEST_RESULT_SUMMARY.txt",JSON.stringify(r.all_ok));
   try {