From 58ced061f95733566ae3eba263128746010ad730 Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Sat, 2 Jul 2016 21:06:08 -0700
Subject: [PATCH 1/3] add "expect" to eslint globals in test/

---
 test/.eslintrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/.eslintrc b/test/.eslintrc
index 6db2a46c53..956287d60c 100644
--- a/test/.eslintrc
+++ b/test/.eslintrc
@@ -1,3 +1,5 @@
 ---
 env:
   mocha: true
+globals:
+  expect: false

From 81873618c9d21ad671ea12f423a5df1aa8f6339f Mon Sep 17 00:00:00 2001
From: Ross Warren <rosswarren4@gmail.com>
Date: Sat, 9 Jul 2016 04:32:25 +0100
Subject: [PATCH 2/3] Add --preserve-symlinks flag for node (#2364)

---
 bin/_mocha | 1 +
 bin/mocha  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bin/_mocha b/bin/_mocha
index 94550d87c0..8a3f50ad5e 100755
--- a/bin/_mocha
+++ b/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')
diff --git a/bin/mocha b/bin/mocha
index f6606e49b5..99bc18ae4d 100755
--- a/bin/mocha
+++ b/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;
   }

From b37499f30f39b49a4d6892ae8eddee37fec61624 Mon Sep 17 00:00:00 2001
From: Christopher Hiller <boneskull@boneskull.com>
Date: Fri, 8 Jul 2016 23:10:27 -0700
Subject: [PATCH 3/3] don't truncate message-list Error in Base.list(); closes
 #2361 (#2365)

---
 lib/reporters/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index 5fe0eb71a6..4c9e8064cd 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -178,7 +178,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;