diff options
| author | Benjamin Pasero <benjamin.pasero@microsoft.com> | 2021-07-01 16:23:32 +0300 |
|---|---|---|
| committer | Benjamin Pasero <benjamin.pasero@microsoft.com> | 2021-07-01 16:23:37 +0300 |
| commit | 5aa157097611d79d47fb0d557e9875ec372353e1 (patch) | |
| tree | d262ad7cb8a85b73c98f73fe12eb1741013fb90c /scripts | |
| parent | 5caa2d84d76cf1da6882b600302a70df9325e385 (diff) | |
tests - align integration test scripts
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/test-integration.bat | 9 | ||||
| -rwxr-xr-x | scripts/test-integration.sh | 13 |
2 files changed, 16 insertions, 6 deletions
diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index f917d661b34..16a72eea7d1 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -42,10 +42,13 @@ if "%INTEGRATION_TEST_ELECTRON_PATH%"=="" ( echo Running integration tests with '%INTEGRATION_TEST_ELECTRON_PATH%' as build. ) -:: Integration & performance tests in AMD + +:: Tests standalone (AMD) + call .\scripts\test.bat --runGlob **\*.integrationTest.js %* if %errorlevel% neq 0 exit /b %errorlevel% + :: Tests in the extension host set ALL_PLATFORMS_API_TESTS_EXTRA_ARGS=--disable-telemetry --skip-welcome --crash-reporter-directory=%VSCODECRASHDIR% --logsPath=%VSCODELOGSDIR% --no-cached-data --disable-updates --disable-keytar --disable-extensions --disable-workspace-trust --user-data-dir=%VSCODEUSERDATADIR% @@ -74,7 +77,9 @@ mkdir %GITWORKSPACE% call "%INTEGRATION_TEST_ELECTRON_PATH%" %GITWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\git --extensionTestsPath=%~dp0\..\extensions\git\out\test --enable-proposed-api=vscode.git %ALL_PLATFORMS_API_TESTS_EXTRA_ARGS% if %errorlevel% neq 0 exit /b %errorlevel% -:: Tests in commonJS (CSS, HTML) + +:: Tests standalone (CommonJS) + call %~dp0\node-electron.bat %~dp0\..\extensions\css-language-features/server/test/index.js if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index d529a5bc394..4e6115f1c7d 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -57,10 +57,13 @@ else after_suite() { killall $INTEGRATION_TEST_APP_NAME || true; } fi -# Integration tests in AMD + +# Tests standalone (AMD) + ./scripts/test.sh --runGlob **/*.integrationTest.js "$@" after_suite + # Tests in the extension host ALL_PLATFORMS_API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --disable-keytar --disable-extensions --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR" @@ -74,10 +77,10 @@ after_suite "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS after_suite -"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/markdown-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS +"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test/unit $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS after_suite -"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/typescript-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/typescript-language-features --extensionTestsPath=$ROOT/extensions/typescript-language-features/out/test/unit $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS +"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/markdown-language-features/test-workspace --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS after_suite "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/emmet/test-workspace --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS @@ -86,7 +89,9 @@ after_suite "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS after_suite -# Tests in commonJS (CSS, HTML) + +# Tests standalone (CommonJS) + cd $ROOT/extensions/css-language-features/server && $ROOT/scripts/node-electron.sh test/index.js after_suite |