From cf00516f043ba00521e3fc8868d19db5332d2eff Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 10 Jan 2017 14:27:05 +0100
Subject: [PATCH 1/3] Rename the `external/builder/test*.js` files to make it
 more obvious what they test

Currently you have to open the files to be certain which tests each one will run, which we can avoid by appending the directory names to the file names of the tests themselves.
---
 external/builder/{test.js => test-fixtures.js}          | 0
 external/builder/{test2.js => test-fixtures_esprima.js} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename external/builder/{test.js => test-fixtures.js} (100%)
 rename external/builder/{test2.js => test-fixtures_esprima.js} (100%)

diff --git a/external/builder/test.js b/external/builder/test-fixtures.js
similarity index 100%
rename from external/builder/test.js
rename to external/builder/test-fixtures.js
diff --git a/external/builder/test2.js b/external/builder/test-fixtures_esprima.js
similarity index 100%
rename from external/builder/test2.js
rename to external/builder/test-fixtures_esprima.js

From fe9a561d45de33e8db7d1d25a3193f94d88e91f0 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 10 Jan 2017 14:32:40 +0100
Subject: [PATCH 2/3] Actually increment the `errors` counter on failures in
 `test-fixtures.js`/`test_fixtures_esprima.js`, so that the test runners won't
 incorrectly report that the tests passed

---
 external/builder/test-fixtures.js         | 2 ++
 external/builder/test-fixtures_esprima.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/external/builder/test-fixtures.js b/external/builder/test-fixtures.js
index 53c0cd8b6..12fc8af89 100644
--- a/external/builder/test-fixtures.js
+++ b/external/builder/test-fixtures.js
@@ -30,6 +30,8 @@ ls('*-expected.*').forEach(function(expectationFilename) {
     out = ('Error: ' + e.message).replace(/^/gm, '//');
   }
   if (out !== expectation) {
+    errors++;
+
     echo('Assertion failed for ' + inFilename);
     echo('--------------------------------------------------');
     echo('EXPECTED:');
diff --git a/external/builder/test-fixtures_esprima.js b/external/builder/test-fixtures_esprima.js
index aac26bd50..108d9a35a 100644
--- a/external/builder/test-fixtures_esprima.js
+++ b/external/builder/test-fixtures_esprima.js
@@ -33,6 +33,8 @@ ls('*-expected.*').forEach(function(expectationFilename) {
     out = ('Error: ' + e.message).replace(/^/gm, '//');
   }
   if (out !== expectation) {
+    errors++;
+
     echo('Assertion failed for ' + inFilename);
     echo('--------------------------------------------------');
     echo('EXPECTED:');

From 3aa37ae8bc13cdda4935a60eced808330b3d112b Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 10 Jan 2017 14:39:53 +0100
Subject: [PATCH 3/3] Add the `external/builder/fixtures/` directory to
 `.eslintignore`, to avoid having to disable various lint rules locally

This is similar to the already existing exception for `external/builder/fixtures_esprima`.
---
 .eslintignore                       |  1 +
 external/builder/fixtures/.eslintrc | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 external/builder/fixtures/.eslintrc

diff --git a/.eslintignore b/.eslintignore
index e02652bb3..bc3e05a12 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -6,6 +6,7 @@ examples/
 external/bcmaps/
 external/webL10n/
 external/cmapscompress/
+external/builder/fixtures/
 external/builder/fixtures_esprima/
 test/tmp/
 test/features/
diff --git a/external/builder/fixtures/.eslintrc b/external/builder/fixtures/.eslintrc
deleted file mode 100644
index 94eb4f06e..000000000
--- a/external/builder/fixtures/.eslintrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": [
-    ../../.eslintrc
-  ],
-
-  "rules": {
-    "no-empty": "off",
-    "keyword-spacing": "off",
-    "space-infix-ops": "off",
-  },
-}