diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2017-11-05 13:33:13 +0300 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2017-11-07 14:15:31 +0300 |
commit | 09d22ddab5eded7790b68059d91186117c43f3b7 (patch) | |
tree | 7e18f2a247115b2904d0e8c61f27528bc631bb43 /lib/internal/v8_prof_polyfill.js | |
parent | 421316dca17d72919a928f414af8d03e2f3a2476 (diff) |
lib: shuffle v8_prof_polyfill.js for unit testing
Make it possible to test the versionCheck() function from that file in
isolation.
PR-URL: https://github.com/nodejs/node/pull/16769
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib/internal/v8_prof_polyfill.js')
-rw-r--r-- | lib/internal/v8_prof_polyfill.js | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/lib/internal/v8_prof_polyfill.js b/lib/internal/v8_prof_polyfill.js index 72efa46f041..1bfa111d8d8 100644 --- a/lib/internal/v8_prof_polyfill.js +++ b/lib/internal/v8_prof_polyfill.js @@ -25,6 +25,13 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +module.exports = { versionCheck }; + +// Don't execute when required directly instead of being eval'd from +// lib/internal/v8_prof_processor.js. This way we can test functions +// from this file in isolation. +if (module.id === 'internal/v8_prof_polyfill') return; + // Node polyfill const fs = require('fs'); const cp = require('child_process'); @@ -64,7 +71,18 @@ const fd = fs.openSync(logFile, 'r'); const buf = Buffer.allocUnsafe(4096); const dec = new (require('string_decoder').StringDecoder)('utf-8'); var line = ''; -versionCheck(); + +{ + const message = versionCheck(peekline(), process.versions.v8); + if (message) console.log(message); +} + +function peekline() { + const s = readline(); + line = s + '\n' + line; + return s; +} + function readline() { while (true) { const lineBreak = line.indexOf('\n'); @@ -81,27 +99,21 @@ function readline() { } } -function versionCheck() { +function versionCheck(firstLine, expected) { // v8-version looks like // "v8-version,$major,$minor,$build,$patch[,$embedder],$candidate" // whereas process.versions.v8 is either "$major.$minor.$build-$embedder" or // "$major.$minor.$build.$patch-$embedder". - var firstLine = readline(); - line = firstLine + '\n' + line; firstLine = firstLine.split(','); - const curVer = process.versions.v8.split(/[.\-]/); + const curVer = expected.split(/[.\-]/); if (firstLine.length !== 6 && firstLine.length !== 7 || firstLine[0] !== 'v8-version') { - console.log('Unable to read v8-version from log file.'); - return; + return 'Unable to read v8-version from log file.'; } // Compare major, minor and build; ignore the patch and candidate fields. - for (var i = 0; i < 3; i++) { - if (curVer[i] !== firstLine[i + 1]) { - console.log('Testing v8 version different from logging version'); - return; - } - } + for (var i = 0; i < 3; i++) + if (curVer[i] !== firstLine[i + 1]) + return 'Testing v8 version different from logging version'; } function macCppfiltNm(out) { |