Skip to content

Silence echo in do command within run_python_compiler.bat #25416

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+16 −20
Open

Silence echo in do command within run_python_compiler.bat #25416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfd0682
Silence echo in `do` command within run_python_compiler.bat
MarcosASandoval Sep 29, 2025
0a6aedd
Ran create_entry_points.py
MarcosASandoval Sep 30, 2025
11d5f1d
Merge branch 'main' into mas-entry-point-fix
MarcosASandoval Oct 1, 2025
e953bf0
Enable checking Windows shell command with quotes produces no extra o…
MarcosASandoval Oct 1, 2025
b6c478c
turn off command echoing
MarcosASandoval Oct 2, 2025
05e1862
undo command echo silencing as it was just a test
MarcosASandoval Oct 2, 2025
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
4 changes: 2 additions & 2 deletions bootstrap.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
::
:: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
::
:: To make modifications to this file, edit `tools/run_python.bat` and then run
:: To make modifications to this file, edit `tools/maint/run_python.bat` and then run
:: `tools/maint/create_entry_points.py`

:: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
Expand All @@ -26,7 +26,7 @@
set "MYDIR=%~dp0"
goto FOUND_MYDIR
)
@for %%I in (%~n0.bat) do (
@for %%I in (%~n0.bat) do @(
@if exist %%~$PATH:I (
set MYDIR=%%~dp$PATH:I
) else (
Expand Down
6 changes: 3 additions & 3 deletions em++.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
::
:: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
::
:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
:: then run `tools/create_entry_points.py`
:: To make modifications to this file, edit `tools/maint/run_python_compiler.bat` and
:: then run `tools/maint/create_entry_points.py`

:: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
:: or there will be a parsing error.
Expand All @@ -26,7 +26,7 @@
set "MYDIR=%~dp0"
goto FOUND_MYDIR
)
@for %%I in (%~n0.bat) do (
@for %%I in (%~n0.bat) do @(
@if exist %%~$PATH:I (
set MYDIR=%%~dp$PATH:I
) else (
Expand Down
6 changes: 3 additions & 3 deletions emcc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
::
:: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
::
:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
:: then run `tools/create_entry_points.py`
:: To make modifications to this file, edit `tools/maint/run_python_compiler.bat` and
:: then run `tools/maint/create_entry_points.py`

:: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
:: or there will be a parsing error.
Expand All @@ -26,7 +26,7 @@
set "MYDIR=%~dp0"
goto FOUND_MYDIR
)
@for %%I in (%~n0.bat) do (
@for %%I in (%~n0.bat) do @(
@if exist %%~$PATH:I (
set MYDIR=%%~dp$PATH:I
) else (
Expand Down
4 changes: 2 additions & 2 deletions test/runner.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
::
:: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
::
:: To make modifications to this file, edit `tools/run_python.bat` and then run
:: To make modifications to this file, edit `tools/maint/run_python.bat` and then run
:: `tools/maint/create_entry_points.py`

:: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
Expand All @@ -26,7 +26,7 @@
set "MYDIR=%~dp0"
goto FOUND_MYDIR
)
@for %%I in (%~n0.bat) do (
@for %%I in (%~n0.bat) do @(
@if exist %%~$PATH:I (
set MYDIR=%%~dp$PATH:I
) else (
Expand Down
6 changes: 1 addition & 5 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15102,11 +15102,7 @@ def test_shell_cmd_with_quotes(self):
print('running cmd:', cmd)
with env_modify({'PATH': new_path}):
proc = subprocess.run(cmd, capture_output=True, text=True, shell=True, check=True)
# There is currently a bug in the windows .bat files that leads to stdout
# not being empty in this case.
# See https://github.com/emscripten-core/emscripten/pull/25416
if not WINDOWS:
self.assertEqual(proc.stdout, '')
self.assertEqual(proc.stdout, '')
self.assertEqual(proc.stderr, '')

def test_browser_too_old(self):
Expand Down
4 changes: 2 additions & 2 deletions tools/maint/run_python.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
::
:: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
::
:: To make modifications to this file, edit `tools/run_python.bat` and then run
:: To make modifications to this file, edit `tools/maint/run_python.bat` and then run
:: `tools/maint/create_entry_points.py`

:: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
Expand All @@ -26,7 +26,7 @@
set "MYDIR=%~dp0"
goto FOUND_MYDIR
)
@for %%I in (%~n0.bat) do (
@for %%I in (%~n0.bat) do @(
@if exist %%~$PATH:I (
set MYDIR=%%~dp$PATH:I
) else (
Expand Down
6 changes: 3 additions & 3 deletions tools/maint/run_python_compiler.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
::
:: Automatically generated by `create_entry_points.py`; DO NOT EDIT.
::
:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
:: then run `tools/create_entry_points.py`
:: To make modifications to this file, edit `tools/maint/run_python_compiler.bat` and
:: then run `tools/maint/create_entry_points.py`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also run this script so that emcc.bat and em++.bat are regenerated based on it?


:: N.b. In Windows .bat scripts, the ':' character cannot appear inside any if () blocks,
:: or there will be a parsing error.
Expand All @@ -26,7 +26,7 @@
set "MYDIR=%~dp0"
goto FOUND_MYDIR
)
@for %%I in (%~n0.bat) do (
@for %%I in (%~n0.bat) do @(
@if exist %%~$PATH:I (
set MYDIR=%%~dp$PATH:I
) else (
Expand Down