File tree Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change 3
3
const assert = require ( 'assert' ) ;
4
4
const { spawnSync, execFileSync } = require ( 'child_process' ) ;
5
5
const common = require ( './' ) ;
6
+ const os = require ( 'os' ) ;
6
7
const util = require ( 'util' ) ;
7
8
8
9
// Workaround for Windows Server 2008R2
@@ -43,6 +44,9 @@ function logAfterTime(time) {
43
44
}
44
45
45
46
function checkOutput ( str , check ) {
47
+ if ( common . isWindows && typeof str === 'string' ) {
48
+ str = str . replaceAll ( os . EOL , '\n' ) ;
49
+ }
46
50
if ( ( check instanceof RegExp && ! check . test ( str ) ) ||
47
51
( typeof check === 'string' && check !== str ) ) {
48
52
return { passed : false , reason : `did not match ${ util . inspect ( check ) } ` } ;
Original file line number Diff line number Diff line change @@ -152,12 +152,6 @@ for (const extraSnapshotArgs of [
152
152
{ cwd : tmpdir . path } ) ;
153
153
}
154
154
155
- // Skipping rest of the test on Windows because it fails in the CI
156
- // TODO(StefanStojanovic): Reenable rest of the test after fixing it
157
- if ( common . isWindows ) {
158
- return ;
159
- }
160
-
161
155
// Guarantee NODE_REPL_EXTERNAL_MODULE won't bypass kDisableNodeOptionsEnv
162
156
{
163
157
spawnSyncAndExit (
You can’t perform that action at this time.
0 commit comments