Skip to content

Commit 0fc6bda

Browse files
committed
[test] Mark freetype test as crossplaform. NFC
See emscripten-core#22585 (comment)
1 parent cac4688 commit 0fc6bda

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

test/test_other.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,6 +2484,7 @@ def test_bzip2(self):
24842484

24852485
@with_all_sjlj
24862486
@requires_network
2487+
@crossplatform
24872488
def test_freetype(self):
24882489
# copy the Liberation Sans Bold truetype file located in the
24892490
# <emscripten_root>/test/freetype to the compilation folder

tools/shared.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ def cap_max_workers_in_pool(max_workers):
153153
return max_workers
154154

155155

156+
def escape_for_cmd_exe(arg):
157+
arg = arg.replace('<', '^<')
158+
arg = arg.replace('>', '^>')
159+
return arg
160+
161+
156162
def run_multiple_processes(commands,
157163
env=None,
158164
route_stdout_to_temp_files_suffix=None,
@@ -205,10 +211,13 @@ def get_finished_process():
205211
stdout = temp_files.get(route_stdout_to_temp_files_suffix)
206212
else:
207213
stdout = None
214+
cmd = commands[i]
215+
if utils.WINDOWS:
216+
cmd = [escape_for_cmd_exe(arg) for arg in cmd]
208217
if DEBUG:
209-
logger.debug('Running subprocess %d/%d: %s' % (i + 1, len(commands), ' '.join(commands[i])))
210-
print_compiler_stage(commands[i])
211-
proc = subprocess.Popen(commands[i], stdout=stdout, stderr=None, env=env, cwd=cwd)
218+
logger.debug('Running subprocess %d/%d: %s' % (i + 1, len(commands), ' '.join(cmd)))
219+
print_compiler_stage(cmd)
220+
proc = subprocess.Popen(cmd, stdout=stdout, stderr=None, env=env, cwd=cwd)
212221
processes[i] = proc
213222
if route_stdout_to_temp_files_suffix:
214223
std_outs.append((i, stdout.name))

0 commit comments

Comments
 (0)