diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index deeb6a0768dc0..08d17acd68281 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -58,7 +58,7 @@ if defined SHOW_HELP ( echo Available suites: echo api-folder, api-workspace, colorize, terminal-suggest, typescript, echo markdown, emmet, git, git-base, ipynb, notebook-renderers, - echo configuration-editing, github-authentication, copilot, css, html, json + echo configuration-editing, github-authentication, copilot, css, html echo. echo All other options are forwarded to the node.js test runner ^(see scripts\test.bat --help^). echo Note: extra options are not forwarded to extension host suites ^(--suite mode^). @@ -108,12 +108,12 @@ echo Storing log files into '%VSCODELOGSDIR%'. :: Validate --suite filter matches at least one known suite if defined SUITE_FILTER ( set "_any_match=" - for %%s in (api-folder api-workspace colorize terminal-suggest typescript markdown emmet git git-base ipynb notebook-renderers configuration-editing github-authentication copilot css html json) do ( + for %%s in (api-folder api-workspace colorize terminal-suggest typescript markdown emmet git git-base ipynb notebook-renderers configuration-editing github-authentication copilot css html) do ( call :should_run_suite %%s && set "_any_match=1" ) if not defined _any_match ( echo Error: no suites match filter '%SUITE_FILTER%' - echo Available suites: api-folder api-workspace colorize terminal-suggest typescript markdown emmet git git-base ipynb notebook-renderers configuration-editing github-authentication copilot css html json + echo Available suites: api-folder api-workspace colorize terminal-suggest typescript markdown emmet git git-base ipynb notebook-renderers configuration-editing github-authentication copilot css html goto :failed ) ) @@ -310,13 +310,6 @@ call %SCRIPT_DIR%\node-electron.bat %SCRIPT_DIR%\..\extensions\html-language-fea if %errorlevel% neq 0 exit /b %errorlevel% :skip_html -call :should_run_suite json || goto skip_json -echo. -echo ### JSON tests -call "%SCRIPT_DIR%\node-electron.bat" "%SCRIPT_DIR%\..\extensions\json-language-features\client\out\test\index.js" -if %errorlevel% neq 0 goto :failed -:skip_json - :: Cleanup diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index 986dc1c412328..b9072ca039b0e 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -52,7 +52,7 @@ while [[ $# -gt 0 ]]; do done # Known suite names (used for help text and validation) -KNOWN_SUITES="api-folder api-workspace colorize terminal-suggest typescript markdown emmet git git-base ipynb notebook-renderers configuration-editing github-authentication copilot css html json" +KNOWN_SUITES="api-folder api-workspace colorize terminal-suggest typescript markdown emmet git git-base ipynb notebook-renderers configuration-editing github-authentication copilot css html" if $HELP; then echo "Usage: $0 [options]" @@ -338,13 +338,6 @@ echo cd "$ROOT/extensions/html-language-features/server" && "$ROOT/scripts/node-electron.sh" test/index.js fi -if should_run_suite json; then -echo -echo "### JSON tests" -echo -"$ROOT/scripts/node-electron.sh" "$ROOT/extensions/json-language-features/client/out/test/index.js" -fi - # Cleanup