From 93d32839acd27e1e87f20a06eb40d0ef1cc3bc9c Mon Sep 17 00:00:00 2001
From: Willi Goesgens <willi@arangodb.com>
Date: Fri, 26 Sep 2014 15:53:22 +0200
Subject: [PATCH] differentiate between ABORT/TERMINATED/other

---
 js/server/modules/org/arangodb/testing.js | 32 ++++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/js/server/modules/org/arangodb/testing.js b/js/server/modules/org/arangodb/testing.js
index 24c15dad57..06bd5f0f7f 100644
--- a/js/server/modules/org/arangodb/testing.js
+++ b/js/server/modules/org/arangodb/testing.js
@@ -402,9 +402,9 @@ function executeAndWait (cmd, args) {
   var startTime = time();
   var res = statusExternal(pid, true);
   var deltaTime = time() - startTime;
-  print("Finished: " + res.status + " Signal: " + res.exit + " Time Elapsed: " + deltaTime);
 
   if (res.status === "TERMINATED") {
+    print("Finished: " + res.status + " Exitcode: " + res.exit + " Time Elapsed: " + deltaTime);
     if (res.exit === 0) {
       return { status: true, message: "", duration: deltaTime};
     }
@@ -412,10 +412,19 @@ function executeAndWait (cmd, args) {
       return { status: false, message: "exit code was " + res.exit, duration: deltaTime};
     }
   }
-  else {
+  else if (res.status === "ABORTED") {
+    print("Finished: " + res.status + " Signal: " + res.signal + " Time Elapsed: " + deltaTime);
     return {
       status: false,
-      message: "irregular termination: " + res.status + "Exit-Signal: " + res.exit,
+      message: "irregular termination: " + res.status + " Exit-Signal: " + res.signal,
+      duration: deltaTime
+    };
+  }
+  else {
+    print("Finished: " + res.status + " Exitcode: " + res.exit + " Time Elapsed: " + deltaTime);
+    return {
+      status: false,
+      message: "irregular termination: " + res.status + " Exit-Code: " + res.exit,
       duration: deltaTime
     };
   }
@@ -683,19 +692,28 @@ function rubyTests (options, ssl) {
         var startTime = time();
         var r = statusExternal(pid, true);
         var deltaTime = time() - startTime;
-        print("Finished: " + r.status + " Signal: " + r.exit + " Time Elapsed: " + deltaTime);
         if (r.status === "TERMINATED") {
+          print("Finished: " + r.status + " Signal: " + r.exit + " Time Elapsed: " + deltaTime);
           if (r.exit === 0) {
             result[n] =  { status: true, message: "", duration: deltaTime };
           }
           else {
-            result[n] = { status: false, message: "exit code was " + r.exit, duration: deltaTime};
+            result[n] = { status: false, message: " exit code was " + r.exit, duration: deltaTime};
           }
         }
-        else {
+        else if (r.status === "ABORTED") {
+          print("Finished: " + r.status + " Signal: " + r.exit + " Time Elapsed: " + deltaTime);
           result[n] = {
             status: false,
-            message: "irregular termination: " + r.status + "Exit-Signal: " + r.exit,
+            message: "irregular termination: " + r.status + " Exit-Signal: " + r.signal,
+            duration: deltaTime
+          };
+        }
+        else {
+          print("Finished: " + r.status + " Exit Status: " + r.exit + " Time Elapsed: " + deltaTime);
+          result[n] = {
+            status: false,
+            message: "irregular termination: " + r.status + " Exit-code: " + r.exit,
             duration: deltaTime
           };
         }