Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ jobs:
# note we do *not* build all libraries and freeze the cache; as we run
# only limited tests here, it's more efficient to build on demand
- run-tests:
test_targets: "other.test_emcc_cflags other.test_stdin other.test_bad_triple wasm2.test_sse1 wasm2.test_ccall other.test_closure_externs other.test_binaryen_debug other.test_js_optimizer_parse_error other.test_output_to_nowhere other.test_emcc_dev_null other.test_cmake* other.test_system_include_paths other.test_emar_response_file wasm2.test_utf16"
test_targets: "other.test_emcc_cflags other.test_stdin other.test_bad_triple wasm2.test_sse1 wasm2.test_ccall other.test_closure_externs other.test_binaryen_debug other.test_js_optimizer_parse_error other.test_output_to_nowhere other.test_emcc_dev_null other.test_cmake* other.test_system_include_paths other.test_emar_response_file wasm2.test_utf16 other.test_special_chars_in_arguments"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

What is this list of tests for?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This is subset of tests that we run on windows during github CI.

test-mac:
executor: mac
steps:
Expand Down
10 changes: 5 additions & 5 deletions em++.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
:: then run `tools/create_entry_points.py`

@setlocal enabledelayedexpansion
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
)

@set ARGS=%*
@if "%_EMCC_CCACHE%"=="" (
:: Do regular invocation of em++.py compiler
"%EM_PY%" "%~dp0\%~n0.py" !ARGS!
:: Do regular invocation of the python compiler driver
set CMD="%EM_PY%" "%~dp0\%~n0.py"
) else (
:: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
set _EMCC_CCACHE=
ccache "%~dp0\%~n0.bat" !ARGS!
set CMD=ccache "%~dp0\%~n0.bat"
)

@%CMD% %*
10 changes: 5 additions & 5 deletions emcc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
:: then run `tools/create_entry_points.py`

@setlocal enabledelayedexpansion
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
)

@set ARGS=%*
@if "%_EMCC_CCACHE%"=="" (
:: Do regular invocation of em++.py compiler
"%EM_PY%" "%~dp0\%~n0.py" !ARGS!
:: Do regular invocation of the python compiler driver
set CMD="%EM_PY%" "%~dp0\%~n0.py"
) else (
:: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
set _EMCC_CCACHE=
ccache "%~dp0\%~n0.bat" !ARGS!
set CMD=ccache "%~dp0\%~n0.bat"
)

@%CMD% %*
9 changes: 9 additions & 0 deletions tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -10534,3 +10534,12 @@ def test_auto_ptr_cxx17(self):
'-std=c++17',
'-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR',
'-Wno-deprecated-declarations'])

def test_special_chars_in_arguments(self):
# We had some regressions where the windows `.bat` files that run the compiler
# driver were failing to accept certain special characters such as `(`, `)` and `!`.
# See https://github.com/emscripten-core/emscripten/issues/14063
create_file('test(file).c', 'int main() { return 0; }')
create_file('test!.c', 'int main() { return 0; }')
self.run_process([EMCC, 'test(file).c'])
self.run_process([EMCC, 'test!.c'])
10 changes: 5 additions & 5 deletions tools/run_python_compiler.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
:: To make modifications to this file, edit `tools/run_python_compiler.bat` and
:: then run `tools/create_entry_points.py`

@setlocal enabledelayedexpansion
@set EM_PY=%EMSDK_PYTHON%
@if "%EM_PY%"=="" (
set EM_PY=python
)

@set ARGS=%*
@if "%_EMCC_CCACHE%"=="" (
:: Do regular invocation of em++.py compiler
"%EM_PY%" "%~dp0\%~n0.py" !ARGS!
:: Do regular invocation of the python compiler driver
set CMD="%EM_PY%" "%~dp0\%~n0.py"
) else (
:: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
set _EMCC_CCACHE=
ccache "%~dp0\%~n0.bat" !ARGS!
set CMD=ccache "%~dp0\%~n0.bat"
)

@%CMD% %*