Merge branch 'master' into v3.0.0

* master:
  don't truncate message-list Error in Base.list(); closes #2361 (#2365)
  Add --preserve-symlinks flag for node (#2364)
  add "expect" to eslint globals in test/

bin/_mocha

@@ -84,6 +84,7 @@ program
   .option('--globals <names>', 'allow the given comma-delimited global [names]', list, [])
   .option('--es_staging', 'enable all staged features')
   .option('--harmony<_classes,_generators,...>', 'all node --harmony* flags are available')
+  .option('--preserve-symlinks', 'Instructs the module loader to preserve symbolic links when resolving and caching modules')
   .option('--icu-data-dir', 'include ICU data')
   .option('--inline-diffs', 'display actual/expected differences inline within each string')
   .option('--interfaces', 'display available interfaces')

bin/mocha

@@ -50,6 +50,7 @@ process.argv.slice(2).forEach(function(arg){
       else if (0 == arg.indexOf('--trace')) args.unshift(arg);
       else if (0 == arg.indexOf('--icu-data-dir')) args.unshift(arg);
       else if (0 == arg.indexOf('--max-old-space-size')) args.unshift(arg);
+      else if (0 == arg.indexOf('--preserve-symlinks')) args.unshift(arg);
       else args.push(arg);
       break;
   }

lib/reporters/base.js

@@ -180,7 +180,7 @@ exports.list = function(failures) {
       message = '';
     }
     var stack = err.stack || message;
-    var index = stack.indexOf(message);
+    var index = message ? stack.indexOf(message) : -1;
     var actual = err.actual;
     var expected = err.expected;
     var escape = true;

test/.eslintrc

@@ -1,3 +1,5 @@
 ---
 env:
   mocha: true
+globals:
+  expect: false