Skip to content

Fix for chatty bat files when path contains spaces #20916

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

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Fix for chatty bat files when path contains spaces #20916

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
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ jobs:
# windows and mac do not have separate build and test jobs, as they only run
# a limited set of tests; it is simpler and faster to do it all in one job.
test-windows:
working_directory: "~/path with spaces"
executor:
name: win/vs2019
shell: bash.exe -eo pipefail
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion em++.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion em-config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emar.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion embuilder.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emcc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emcmake.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emconfigure.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emdump.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emdwp.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emmake.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emnm.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emprofile.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emranlib.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emrun.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emscons.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emsize.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emstrip.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion emsymbolizer.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion system/bin/sdl-config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion system/bin/sdl2-config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion test/runner.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
7 changes: 7 additions & 0 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,6 +3269,7 @@ def test_file_packager_depfile(self):
self.run_process([FILE_PACKAGER, 'test.data', '--js-output=test.js', '--depfile=test.data.d', '--from-emcc', '--preload', '.'])
output = read_file('test.data.d')
file_packager = utils.normalize_path(shared.replace_suffix(FILE_PACKAGER, '.py'))
file_packager = file_packager.replace(' ', '\\ ')
lines = output.splitlines()
split = lines.index(': \\')
before, after = set(lines[:split]), set(lines[split + 1:])
Expand Down Expand Up @@ -14333,3 +14334,9 @@ def test_embind_negative_enum_values(self):
expected = '-1\n0\n1\n'
self.do_run(src, expected_output=expected,
emcc_args=['-lembind', '-sALLOW_MEMORY_GROWTH', '-sMAXIMUM_MEMORY=4GB'])

@crossplatform
def test_no_extra_output(self):
self.run_process([EMCC, '-c', test_file('hello_world.c')])
output = self.run_process([EMCC, '-c', test_file('hello_world.c')], stdout=PIPE, stderr=STDOUT).stdout
self.assertEqual(output, '')
2 changes: 1 addition & 1 deletion tools/file_packager.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion tools/maint/run_python.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion tools/maint/run_python_compiler.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down
2 changes: 1 addition & 1 deletion tools/webidl_binder.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:: script is invoked via enclosing the invocation in quotes via PATH lookup, then %~f0 and
:: %~dp0 expansions will not work.
:: So first try if %~dp0 might work, and if not, manually look up this script from PATH.
@if exist %~f0 (
@if exist "%~f0" (
set MYDIR=%~dp0
goto FOUND_MYDIR
)
Expand Down