bug fix for mocha detection

Author: Hongbo Zhang

jscomp/test/fs_test.ml

@@ -48,4 +48,6 @@ let () =
 
 
 let () =
+  (* Js.log ("ARGV", Bs_node.Process.process##argv);   *)
   Mt.from_pair_suites __FILE__ !suites
+

jscomp/test/mt.js

@@ -1,22 +1,28 @@
 'use strict';
 
 var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions");
-var Process                 = require("process");
 var Assert                  = require("assert");
 var Curry                   = require("../../lib/js/curry");
-var Path                    = require("path");
 var $$Array                 = require("../../lib/js/array");
+var Path                    = require("path");
 var List                    = require("../../lib/js/list");
+var Process                 = require("process");
 
 function is_mocha() {
   var match = $$Array.to_list(Process.argv);
   if (match) {
-    var exec = Path.basename(match[0]);
-    if (exec === "mocha") {
-      return /* true */1;
+    var match$1 = match[1];
+    if (match$1) {
+      var exec = Path.basename(match$1[0]);
+      if (exec === "mocha") {
+        return /* true */1;
+      }
+      else {
+        return +(exec === "_mocha");
+      }
     }
     else {
-      return +(exec === "_mocha");
+      return /* false */0;
     }
   }
   else {
@@ -92,4 +98,4 @@ function from_pair_suites(name, suites) {
 
 exports.from_suites      = from_suites;
 exports.from_pair_suites = from_pair_suites;
-/* process Not a pure module */
+/* assert Not a pure module */

jscomp/test/mt.ml

@@ -28,8 +28,8 @@ let assert_notequal = neq
 
 let is_mocha () =
   match Array.to_list Bs_node.Process.process##argv with
-  | cmd :: _ ->
-    let exec = Bs_node.Path.basename cmd in     
+  | _node :: mocha ::  _ ->
+    let exec = Bs_node.Path.basename mocha in     
     exec = "mocha" || exec = "_mocha"
   | _ -> false
 (* assert -- raises an AssertionError which mocha handls better