From 8901dad6f2adba42036b6a8aa3da9dfad66950bd Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Fri, 26 May 2017 12:49:38 -0600
Subject: [PATCH 1/2] Revert "fix concat test on windows"

This reverts commit d1dd0cd6df82d1b1362d839f0b42dc09c5bba8d5.
---
 src/meta/minifier.js |  2 +-
 test/build.js        | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/meta/minifier.js b/src/meta/minifier.js
index ea911e5aaf..e9b6243d2f 100644
--- a/src/meta/minifier.js
+++ b/src/meta/minifier.js
@@ -174,7 +174,7 @@ function concat(data, callback) {
 				return callback(err);
 			}
 
-			var output = files.join(os.EOL + ';');
+			var output = files.join('\n;');
 			fs.writeFile(data.destPath, output, callback);
 		});
 
diff --git a/test/build.js b/test/build.js
index b8687d86bb..9fc8230992 100644
--- a/test/build.js
+++ b/test/build.js
@@ -3,7 +3,6 @@
 var string = require('string');
 var path = require('path');
 var fs = require('fs');
-var os = require('os');
 var assert = require('assert');
 var mkdirp = require('mkdirp');
 var rimraf = require('rimraf');
@@ -43,15 +42,16 @@ describe('minifier', function () {
 
 			assert.strictEqual(
 				fs.readFileSync(destPath).toString(),
-				'(function (window, document) {' + os.EOL +
-				'\twindow.doStuff = function () {' + os.EOL +
-				'\t\tdocument.body.innerHTML = \'Stuff has been done\';' + os.EOL +
-				'\t};' + os.EOL +
-				'})(window, document);' + os.EOL +
-				os.EOL +
-				';function foo(name, age) {' + os.EOL +
-				'\treturn \'The person known as "\' + name + \'" is \' + age + \' years old\';' + os.EOL +
-				'}' + os.EOL
+				'(function (window, document) {' +
+				'\n\twindow.doStuff = function () {' +
+				'\n\t\tdocument.body.innerHTML = \'Stuff has been done\';' +
+				'\n\t};' +
+				'\n})(window, document);' +
+				'\n' +
+				'\n;function foo(name, age) {' +
+				'\n\treturn \'The person known as "\' + name + \'" is \' + age + \' years old\';' +
+				'\n}' +
+				'\n'
 			);
 			done();
 		});

From 5f36156e0d60b396f8651567203f63027ee2a7a8 Mon Sep 17 00:00:00 2001
From: Peter Jaszkowiak <p.jaszkow@gmail.com>
Date: Fri, 26 May 2017 12:51:05 -0600
Subject: [PATCH 2/2] Fix tests on Windows with CRLF

---
 test/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/build.js b/test/build.js
index 9fc8230992..a05331f463 100644
--- a/test/build.js
+++ b/test/build.js
@@ -41,7 +41,7 @@ describe('minifier', function () {
 			assert(file.existsSync(destPath));
 
 			assert.strictEqual(
-				fs.readFileSync(destPath).toString(),
+				fs.readFileSync(destPath).toString().replace(/\r\n/g, '\n'),
 				'(function (window, document) {' +
 				'\n\twindow.doStuff = function () {' +
 				'\n\t\tdocument.body.innerHTML = \'Stuff has been done\';' +