Skip to content

tests: revert JSON integration runner wiring #336896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Dmitriy Vasyura (dmitrivMS) wants to merge 1 commit into from
Closed

tests: revert JSON integration runner wiring #336896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions scripts/test-integration.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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^).
Expand Down Expand Up @@ -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
)
)
Expand Down Expand Up @@ -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

Expand Down
9 changes: 1 addition & 8 deletions scripts/test-integration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]"
Expand Down Expand Up @@ -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

Expand Down
Loading