build for 2.3.0

nodejs · Jun 22, 2015 · edae701 · edae701
1 parent b681059
commit edae701
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -35,6 +35,7 @@ Stream = require('st' + 'ream');
 }catch(_){Stream = require('events').EventEmitter;}}())
 /*</replacement>*/
 
+var Buffer = require('buffer').Buffer;
 
 /*<replacement>*/
 var util = require('core-util-is');

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -32,6 +32,7 @@ Stream = require('st' + 'ream');
 }catch(_){Stream = require('events').EventEmitter;}}())
 /*</replacement>*/
 
+var Buffer = require('buffer').Buffer;
 
 util.inherits(Writable, Stream);
 

diff --git a/test/common.js b/test/common.js
@@ -31,6 +31,60 @@ exports.fixturesDir = path.join(exports.testDir, 'fixtures');
 exports.libDir = path.join(exports.testDir, '../lib');
 exports.tmpDirName = 'tmp';
 exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
+exports.isWindows = process.platform === 'win32';
+
+function rimrafSync(p) {
+  try {
+    var st = fs.lstatSync(p);
+  } catch (e) {
+    if (e.code === 'ENOENT')
+      return;
+  }
+
+  try {
+    if (st && st.isDirectory())
+      rmdirSync(p, null);
+    else
+      fs.unlinkSync(p);
+  } catch (e) {
+    if (e.code === 'ENOENT')
+      return;
+    if (e.code === 'EPERM')
+      return rmdirSync(p, er);
+    if (e.code !== 'EISDIR')
+      throw e;
+    rmdirSync(p, e);
+  }
+}
+
+function rmdirSync(p, originalEr) {
+  try {
+    fs.rmdirSync(p);
+  } catch (e) {
+    if (e.code === 'ENOTDIR')
+      throw originalEr;
+    if (e.code === 'ENOTEMPTY' || e.code === 'EEXIST' || e.code === 'EPERM') {
+      forEach(fs.readdirSync(p), function(f) {
+        rimrafSync(path.join(p, f));
+      });
+      fs.rmdirSync(p);
+    }
+  }
+}
+
+function refreshTmpDir() {
+  if (!process.send) { // Not a child process
+    try {
+      rimrafSync(exports.tmpDir);
+    } catch (e) {
+    }
+
+    try {
+      fs.mkdirSync(exports.tmpDir);
+    } catch (e) {
+    }
+  }
+}
 
 if (process.env.TEST_THREAD_ID) {
   // Distribute ports in parallel tests
@@ -41,6 +95,8 @@ if (process.env.TEST_THREAD_ID) {
 }
 exports.tmpDir = path.join(exports.testDir, exports.tmpDirName);
 
+refreshTmpDir();
+
 var opensslCli = null;
 var inFreeBSDJail = null;
 var localhostIPv4 = null;