From 1e647a26ebdc106644a0abcfaaebc5da3365c665 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 2 Mar 2022 07:39:28 +0100 Subject: [PATCH] Test on Windows --- test/cli/samples/watch/no-config-file/_config.js | 1 + test/cli/samples/watch/node-config-file/_config.js | 1 + test/cli/samples/watch/watch-config-early-update/_config.js | 5 ++++- test/cli/samples/watch/watch-config-error/_config.js | 1 + test/cli/samples/watch/watch-config-initial-error/_config.js | 1 + test/cli/samples/watch/watch-config-no-update/_config.js | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/cli/samples/watch/no-config-file/_config.js b/test/cli/samples/watch/no-config-file/_config.js index af24c566137..d45ea668cb8 100644 --- a/test/cli/samples/watch/no-config-file/_config.js +++ b/test/cli/samples/watch/no-config-file/_config.js @@ -1,6 +1,7 @@ const path = require('path'); module.exports = { + solo: true, description: 'watches without a config file', command: 'rollup main.js --watch --format es --file _actual/main.js', abortOnStderr(data) { diff --git a/test/cli/samples/watch/node-config-file/_config.js b/test/cli/samples/watch/node-config-file/_config.js index 1181c599571..043f51f85b5 100644 --- a/test/cli/samples/watch/node-config-file/_config.js +++ b/test/cli/samples/watch/node-config-file/_config.js @@ -1,6 +1,7 @@ const path = require('path'); module.exports = { + solo: true, description: 'watches using a node_modules config files', command: 'rollup --watch --config node:custom', abortOnStderr(data) { diff --git a/test/cli/samples/watch/watch-config-early-update/_config.js b/test/cli/samples/watch/watch-config-early-update/_config.js index 3af6f00847f..fb17d7608a2 100644 --- a/test/cli/samples/watch/watch-config-early-update/_config.js +++ b/test/cli/samples/watch/watch-config-early-update/_config.js @@ -6,6 +6,7 @@ const configFile = path.join(__dirname, 'rollup.config.js'); let stopUpdate; module.exports = { + solo: true, description: 'immediately reloads the config file if a change happens while it is parsed', command: 'rollup -cw', before() { @@ -45,8 +46,10 @@ module.exports = { }, after() { unlinkSync(configFile); + stopUpdate(); }, abortOnStderr(data) { + console.error('DATA:', JSON.stringify(data)); if (data === 'initial\n') { stopUpdate = writeAndRetry( configFile, @@ -62,7 +65,7 @@ module.exports = { ); return false; } - if (data.includes(`created _actual${path.sep}output2.js`)) { + if (data.includes(`created _actual/output2.js`)) { stopUpdate(); return true; } diff --git a/test/cli/samples/watch/watch-config-error/_config.js b/test/cli/samples/watch/watch-config-error/_config.js index e0d0807f068..107812ae18b 100644 --- a/test/cli/samples/watch/watch-config-error/_config.js +++ b/test/cli/samples/watch/watch-config-error/_config.js @@ -5,6 +5,7 @@ const { atomicWriteFileSync } = require('../../../../utils'); let configFile; module.exports = { + solo: true, description: 'keeps watching the config file in case the config is changed to an invalid state', command: 'rollup -cw', before() { diff --git a/test/cli/samples/watch/watch-config-initial-error/_config.js b/test/cli/samples/watch/watch-config-initial-error/_config.js index 7faa10b357a..37ec4d38515 100644 --- a/test/cli/samples/watch/watch-config-initial-error/_config.js +++ b/test/cli/samples/watch/watch-config-initial-error/_config.js @@ -5,6 +5,7 @@ const { atomicWriteFileSync } = require('../../../../utils'); let configFile; module.exports = { + solo: true, description: 'keeps watching the config file in case the initial file contains an error', command: 'rollup -cw', before() { diff --git a/test/cli/samples/watch/watch-config-no-update/_config.js b/test/cli/samples/watch/watch-config-no-update/_config.js index 3f8dea95e2c..7a89fc99714 100644 --- a/test/cli/samples/watch/watch-config-no-update/_config.js +++ b/test/cli/samples/watch/watch-config-no-update/_config.js @@ -13,6 +13,7 @@ const configContent = '};'; module.exports = { + solo: true, description: 'does not rebuild if the config file is updated without change', command: 'rollup -cw', before() {