diff --git a/test/cli/index.js b/test/cli/index.js index 0e1a58d0437..b89492bd653 100644 --- a/test/cli/index.js +++ b/test/cli/index.js @@ -23,15 +23,10 @@ runTestSuiteWithSamples( done => { process.chdir(config.cwd || dir); - const command = config.command - .replace( - /(^| )rollup($| )/g, - `node ${path.resolve(__dirname, '../../dist/bin')}${path.sep}rollup ` - ) - .replace( - /(^| )shx /g, - `node ${path.resolve(__dirname, '../../node_modules/.bin')}${path.sep}shx ` - ); + const command = config.command.replace( + /(^| )rollup($| )/g, + `node ${path.resolve(__dirname, '../../dist/bin')}${path.sep}rollup ` + ); const childProcess = exec( command, diff --git a/test/cli/samples/stdin/config-file/_config.js b/test/cli/samples/stdin/config-file/_config.js index e9d2e8a0931..fb19d16e661 100644 --- a/test/cli/samples/stdin/config-file/_config.js +++ b/test/cli/samples/stdin/config-file/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'does not replace input with stdin but allows referencing it when using a config file', - command: `shx echo "import {PRINT as p} from './a'; import C from './b'; 0 && fail() || p(C); export {C as value, p as print}" | rollup -c` + command: `echo "import {PRINT as p} from './a'; import C from './b'; 0 && fail() || p(C); export {C as value, p as print}" | rollup -c` }; diff --git a/test/cli/samples/stdin/force-stdin-config-file/_config.js b/test/cli/samples/stdin/force-stdin-config-file/_config.js index ac8dc4c73d7..eb925701928 100644 --- a/test/cli/samples/stdin/force-stdin-config-file/_config.js +++ b/test/cli/samples/stdin/force-stdin-config-file/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'allows forcing inputs to be replaced with stdin in config files', - command: `shx echo "console.log('STDIN');" | rollup -c --stdin` + command: `echo "console.log('STDIN');" | rollup -c --stdin` }; diff --git a/test/cli/samples/stdin/force-stdin-tty/_config.js b/test/cli/samples/stdin/force-stdin-tty/_config.js index c19b71726db..42ee574f29c 100644 --- a/test/cli/samples/stdin/force-stdin-tty/_config.js +++ b/test/cli/samples/stdin/force-stdin-tty/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'allows forcing stdin input on TTY interfaces via option', - command: `shx echo "console.log('PASS');" | ./wrapper.js -f es --stdin` + command: `echo "console.log('PASS');" | ./wrapper.js -f es --stdin` }; diff --git a/test/cli/samples/stdin/no-dash/_config.js b/test/cli/samples/stdin/no-dash/_config.js index bfc70f159ba..b5ebd2b7042 100644 --- a/test/cli/samples/stdin/no-dash/_config.js +++ b/test/cli/samples/stdin/no-dash/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'uses stdin input when piping into Rollup without an input', - command: `shx mkdir -p _actual && shx echo "0 && fail() || console.log('PASS');" | rollup > _actual/out.js` + command: `echo "0 && fail() || console.log('PASS');" | rollup` }; diff --git a/test/cli/samples/stdin/no-dash/_expected/out.js b/test/cli/samples/stdin/no-dash/_expected.js similarity index 100% rename from test/cli/samples/stdin/no-dash/_expected/out.js rename to test/cli/samples/stdin/no-dash/_expected.js diff --git a/test/cli/samples/stdin/no-stdin-config-file/_config.js b/test/cli/samples/stdin/no-stdin-config-file/_config.js index b1f23a423e3..889b9b67e36 100644 --- a/test/cli/samples/stdin/no-stdin-config-file/_config.js +++ b/test/cli/samples/stdin/no-stdin-config-file/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'allows using "-" as a regular file name via flag', - command: `shx echo "console.log('IGNORED');" | rollup -c --no-stdin` + command: `echo "console.log('IGNORED');" | rollup -c --no-stdin` }; diff --git a/test/cli/samples/stdin/no-stdin-tty/_config.js b/test/cli/samples/stdin/no-stdin-tty/_config.js index 292c53e0719..9cb1b2b8822 100644 --- a/test/cli/samples/stdin/no-stdin-tty/_config.js +++ b/test/cli/samples/stdin/no-stdin-tty/_config.js @@ -2,7 +2,7 @@ const { assertStderrIncludes } = require('../../../../utils.js'); module.exports = { description: 'does not use input as stdin on TTY interfaces', - command: `shx echo "console.log('PASS');" | ./wrapper.js -f es`, + command: `echo "console.log('PASS');" | ./wrapper.js -f es`, error(err) { assertStderrIncludes(err.message, 'You must supply options.input to rollup'); } diff --git a/test/cli/samples/stdin/self-import/_config.js b/test/cli/samples/stdin/self-import/_config.js index 691426d2b24..ad167d46068 100644 --- a/test/cli/samples/stdin/self-import/_config.js +++ b/test/cli/samples/stdin/self-import/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'stdin input of code that imports a copy of itself', - command: `shx mkdir -p _actual && shx cat input.txt | rollup -f cjs --silent > _actual/out.js` + command: `shx mkdir -p _actual && shx cat input.txt | rollup -f cjs --silent` }; diff --git a/test/cli/samples/stdin/self-import/_expected/out.js b/test/cli/samples/stdin/self-import/_expected.js similarity index 100% rename from test/cli/samples/stdin/self-import/_expected/out.js rename to test/cli/samples/stdin/self-import/_expected.js diff --git a/test/cli/samples/stdin/with-dash/_config.js b/test/cli/samples/stdin/with-dash/_config.js index 140aa43e535..8a162ae42f9 100644 --- a/test/cli/samples/stdin/with-dash/_config.js +++ b/test/cli/samples/stdin/with-dash/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'stdin input with dash on CLI', - command: `shx mkdir -p _actual && shx echo "0 && fail() || console.log('PASS');" | rollup - > _actual/out.js` + command: `echo "0 && fail() || console.log('PASS');" | rollup -` }; diff --git a/test/cli/samples/stdin/with-dash/_expected/out.js b/test/cli/samples/stdin/with-dash/_expected.js similarity index 100% rename from test/cli/samples/stdin/with-dash/_expected/out.js rename to test/cli/samples/stdin/with-dash/_expected.js