From 8573ce8866d0925dfc250a12f079f498c9766373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Thu, 29 Jun 2017 15:27:23 +0200 Subject: [PATCH 1/3] src: revert 13940 PR broke tests on Windows. Ref: https://github.com/nodejs/node/pull/13940 --- src/node.cc | 2 +- test/parallel/test-icu-data-dir.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node.cc b/src/node.cc index f2656e8a53635d..beeebe6923a18e 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4372,7 +4372,7 @@ void Init(int* argc, if (!i18n::InitializeICUDirectory(icu_data_dir)) { fprintf(stderr, "%s: could not initialize ICU " - "(check NODE_ICU_DATA or --icu-data-dir parameters)\n", + "(check NODE_ICU_DATA or --icu-data-dir parameters)", argv[0]); exit(9); } diff --git a/test/parallel/test-icu-data-dir.js b/test/parallel/test-icu-data-dir.js index f8a5e77dbd9660..3882acb92c767c 100644 --- a/test/parallel/test-icu-data-dir.js +++ b/test/parallel/test-icu-data-dir.js @@ -9,7 +9,7 @@ const { spawnSync } = require('child_process'); const expected = 'could not initialize ICU ' + - '(check NODE_ICU_DATA or --icu-data-dir parameters)\n'; + '(check NODE_ICU_DATA or --icu-data-dir parameters)'; { const child = spawnSync(process.execPath, ['--icu-data-dir=/', '-e', '0']); From 1f83952966a4af6119f124fa2b6f26fe4dc6ddd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Thu, 29 Jun 2017 15:56:09 +0200 Subject: [PATCH 2/3] fix CI on Windows --- src/node.cc | 2 +- test/parallel/test-icu-data-dir.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node.cc b/src/node.cc index beeebe6923a18e..f2656e8a53635d 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4372,7 +4372,7 @@ void Init(int* argc, if (!i18n::InitializeICUDirectory(icu_data_dir)) { fprintf(stderr, "%s: could not initialize ICU " - "(check NODE_ICU_DATA or --icu-data-dir parameters)", + "(check NODE_ICU_DATA or --icu-data-dir parameters)\n", argv[0]); exit(9); } diff --git a/test/parallel/test-icu-data-dir.js b/test/parallel/test-icu-data-dir.js index 3882acb92c767c..8085d7c7927535 100644 --- a/test/parallel/test-icu-data-dir.js +++ b/test/parallel/test-icu-data-dir.js @@ -8,8 +8,8 @@ const assert = require('assert'); const { spawnSync } = require('child_process'); const expected = - 'could not initialize ICU ' + - '(check NODE_ICU_DATA or --icu-data-dir parameters)'; + 'could not initialize ICU check NODE_ICU_DATA or ' + + '(--icu-data-dir parameters)' + (common.isWindows ? '\r\n' : '\n'); { const child = spawnSync(process.execPath, ['--icu-data-dir=/', '-e', '0']); From 08afcaa897a19e704c6b7d19c026fc0d95270196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= Date: Thu, 29 Jun 2017 16:06:39 +0200 Subject: [PATCH 3/3] fix --- test/parallel/test-icu-data-dir.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-icu-data-dir.js b/test/parallel/test-icu-data-dir.js index 8085d7c7927535..5619d934020ace 100644 --- a/test/parallel/test-icu-data-dir.js +++ b/test/parallel/test-icu-data-dir.js @@ -8,8 +8,8 @@ const assert = require('assert'); const { spawnSync } = require('child_process'); const expected = - 'could not initialize ICU check NODE_ICU_DATA or ' + - '(--icu-data-dir parameters)' + (common.isWindows ? '\r\n' : '\n'); + 'could not initialize ICU (check NODE_ICU_DATA or ' + + '--icu-data-dir parameters)' + (common.isWindows ? '\r\n' : '\n'); { const child = spawnSync(process.execPath, ['--icu-data-dir=/', '-e', '0']);