Skip to content

Commit edae701

Browse files
committed
build for 2.3.0
1 parent b681059 commit edae701

File tree

3 files changed

+58
-0
lines changed

3 files changed

+58
-0
lines changed

lib/_stream_readable.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Stream = require('st' + 'ream');
3535
}catch(_){Stream = require('events').EventEmitter;}}())
3636
/*</replacement>*/
3737

38+
var Buffer = require('buffer').Buffer;
3839

3940
/*<replacement>*/
4041
var util = require('core-util-is');

lib/_stream_writable.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Stream = require('st' + 'ream');
3232
}catch(_){Stream = require('events').EventEmitter;}}())
3333
/*</replacement>*/
3434

35+
var Buffer = require('buffer').Buffer;
3536

3637
util.inherits(Writable, Stream);
3738

test/common.js

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,60 @@ exports.fixturesDir = path.join(exports.testDir, 'fixtures');
3131
exports.libDir = path.join(exports.testDir, '../lib');
3232
exports.tmpDirName = 'tmp';
3333
exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
34+
exports.isWindows = process.platform === 'win32';
35+
36+
function rimrafSync(p) {
37+
try {
38+
var st = fs.lstatSync(p);
39+
} catch (e) {
40+
if (e.code === 'ENOENT')
41+
return;
42+
}
43+
44+
try {
45+
if (st && st.isDirectory())
46+
rmdirSync(p, null);
47+
else
48+
fs.unlinkSync(p);
49+
} catch (e) {
50+
if (e.code === 'ENOENT')
51+
return;
52+
if (e.code === 'EPERM')
53+
return rmdirSync(p, er);
54+
if (e.code !== 'EISDIR')
55+
throw e;
56+
rmdirSync(p, e);
57+
}
58+
}
59+
60+
function rmdirSync(p, originalEr) {
61+
try {
62+
fs.rmdirSync(p);
63+
} catch (e) {
64+
if (e.code === 'ENOTDIR')
65+
throw originalEr;
66+
if (e.code === 'ENOTEMPTY' || e.code === 'EEXIST' || e.code === 'EPERM') {
67+
forEach(fs.readdirSync(p), function(f) {
68+
rimrafSync(path.join(p, f));
69+
});
70+
fs.rmdirSync(p);
71+
}
72+
}
73+
}
74+
75+
function refreshTmpDir() {
76+
if (!process.send) { // Not a child process
77+
try {
78+
rimrafSync(exports.tmpDir);
79+
} catch (e) {
80+
}
81+
82+
try {
83+
fs.mkdirSync(exports.tmpDir);
84+
} catch (e) {
85+
}
86+
}
87+
}
3488

3589
if (process.env.TEST_THREAD_ID) {
3690
// Distribute ports in parallel tests
@@ -41,6 +95,8 @@ if (process.env.TEST_THREAD_ID) {
4195
}
4296
exports.tmpDir = path.join(exports.testDir, exports.tmpDirName);
4397

98+
refreshTmpDir();
99+
44100
var opensslCli = null;
45101
var inFreeBSDJail = null;
46102
var localhostIPv4 = null;

0 commit comments

Comments
 (0)