From 0376b5b7baf627b112915183edf9e1ea2d3856b7 Mon Sep 17 00:00:00 2001 From: João Reis Date: Tue, 30 Jul 2019 16:55:15 +0100 Subject: benchmark: use test/common/tmpdir consistently Many benchmarks use test/common/tmpdir. This changes 3 benchmarks that use NODE_TMPDIR to also use test/common/tmpdir. This is necessary in preparation for the next commit that changes tmpdir to delete tmpdir.path when the Node.js process exits. Thus, if multiple benchmarks are run sequentially, the ones that use tmpdir will remove the directory and the ones changed here would fail because it does not exist. This happens when running test/benchmark. Note: to explicitly select a directory for tmpdir, use NODE_TEST_DIR. PR-URL: https://github.com/nodejs/node/pull/28858 Reviewed-By: Rich Trott Reviewed-By: Colin Ihrig --- benchmark/fs/read-stream-throughput.js | 7 +++++-- benchmark/fs/readfile.js | 7 +++++-- benchmark/fs/write-stream-throughput.js | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'benchmark/fs') diff --git a/benchmark/fs/read-stream-throughput.js b/benchmark/fs/read-stream-throughput.js index cb5d98dc32..4c8de58241 100644 --- a/benchmark/fs/read-stream-throughput.js +++ b/benchmark/fs/read-stream-throughput.js @@ -3,11 +3,14 @@ const path = require('path'); const common = require('../common.js'); -const filename = path.resolve(process.env.NODE_TMPDIR || __dirname, - `.removeme-benchmark-garbage-${process.pid}`); const fs = require('fs'); const assert = require('assert'); +const tmpdir = require('../../test/common/tmpdir'); +tmpdir.refresh(); +const filename = path.resolve(tmpdir.path, + `.removeme-benchmark-garbage-${process.pid}`); + let encodingType, encoding, size, filesize; const bench = common.createBenchmark(main, { diff --git a/benchmark/fs/readfile.js b/benchmark/fs/readfile.js index 551804b1db..7460c8e233 100644 --- a/benchmark/fs/readfile.js +++ b/benchmark/fs/readfile.js @@ -5,11 +5,14 @@ const path = require('path'); const common = require('../common.js'); -const filename = path.resolve(process.env.NODE_TMPDIR || __dirname, - `.removeme-benchmark-garbage-${process.pid}`); const fs = require('fs'); const assert = require('assert'); +const tmpdir = require('../../test/common/tmpdir'); +tmpdir.refresh(); +const filename = path.resolve(tmpdir.path, + `.removeme-benchmark-garbage-${process.pid}`); + const bench = common.createBenchmark(main, { dur: [5], len: [1024, 16 * 1024 * 1024], diff --git a/benchmark/fs/write-stream-throughput.js b/benchmark/fs/write-stream-throughput.js index 3936adc7ff..44de0900d8 100644 --- a/benchmark/fs/write-stream-throughput.js +++ b/benchmark/fs/write-stream-throughput.js @@ -3,10 +3,13 @@ const path = require('path'); const common = require('../common.js'); -const filename = path.resolve(process.env.NODE_TMPDIR || __dirname, - `.removeme-benchmark-garbage-${process.pid}`); const fs = require('fs'); +const tmpdir = require('../../test/common/tmpdir'); +tmpdir.refresh(); +const filename = path.resolve(tmpdir.path, + `.removeme-benchmark-garbage-${process.pid}`); + const bench = common.createBenchmark(main, { dur: [5], encodingType: ['buf', 'asc', 'utf'], -- cgit v1.2.3