Fix #1980: Load mocha.opts from bin/mocha and bin/_mocha

mochajs · Dec 26, 2015 · 9b1e587 · 9b1e587
1 parent 4f26ce7
commit 9b1e587
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/bin/_mocha b/bin/_mocha
@@ -171,9 +171,10 @@ program.on('require', function(mod){
   requires.push(mod);
 });
 
-// load mocha.opts into process.argv
-
-getOptions();
+// If not already done, load mocha.opts
+if (!process.env.LOADED_MOCHA_OPTS) {
+  getOptions();
+}
 
 // parse args
 

diff --git a/bin/mocha b/bin/mocha
@@ -8,8 +8,13 @@
 var spawn = require('child_process').spawn,
   path = require('path'),
   fs = require('fs'),
+  getOptions = require('./options'),
   args = [path.join(__dirname, '_mocha')];
 
+// Load mocha.opts into process.argv
+// Must be loaded here to handle node-specific options
+getOptions();
+
 process.argv.slice(2).forEach(function(arg){
   var flag = arg.split('=')[0];
 

diff --git a/bin/options.js b/bin/options.js
@@ -34,4 +34,6 @@ function getOptions() {
   } catch (err) {
     // ignore
   }
+
+  process.env.LOADED_MOCHA_OPTS = true;
 }