44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 0216a3a3d9920be1c65aa1ed90b0548b04a99d05 Mon Sep 17 00:00:00 2001
|
|
From: Alethea Rose <alethea@alethearose.com>
|
|
Date: Wed, 15 Feb 2017 22:21:51 -0500
|
|
Subject: [PATCH 10/23] Fix incorrect test assumptions for MinGW
|
|
|
|
---
|
|
test/parallel/test-debugger-pid.js | 3 ++-
|
|
test/parallel/test-npm-install.js | 5 +++++
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/test/parallel/test-debugger-pid.js b/test/parallel/test-debugger-pid.js
|
|
index 157939c0..6decf6fb 100644
|
|
--- a/test/parallel/test-debugger-pid.js
|
|
+++ b/test/parallel/test-debugger-pid.js
|
|
@@ -15,8 +15,9 @@ const interfacer = spawn(process.execPath, ['inspect', '-p', '655555']);
|
|
|
|
interfacer.stdout.setEncoding('utf-8');
|
|
interfacer.stderr.setEncoding('utf-8');
|
|
+const newline = common.isMinGW ? '\r\n' : '\n';
|
|
const onData = (data) => {
|
|
- data = (buffer + data).split('\n');
|
|
+ data = (buffer + data).split(newline);
|
|
buffer = data.pop();
|
|
data.forEach((line) => interfacer.emit('line', line));
|
|
};
|
|
diff --git a/test/parallel/test-npm-install.js b/test/parallel/test-npm-install.js
|
|
index fe9dbd46..d5db2c43 100644
|
|
--- a/test/parallel/test-npm-install.js
|
|
+++ b/test/parallel/test-npm-install.js
|
|
@@ -11,6 +11,11 @@ const assert = require('assert');
|
|
const fs = require('fs');
|
|
const fixtures = require('../common/fixtures');
|
|
|
|
+if(common.isMinGW) {
|
|
+ common.skip('npm is split into its own package');
|
|
+ return;
|
|
+}
|
|
+
|
|
const tmpdir = require('../common/tmpdir');
|
|
tmpdir.refresh();
|
|
const npmSandbox = tmpdir.resolve('npm-sandbox');
|
|
--
|
|
2.17.0.windows.1
|