Move fonts used for pixel tests to their own directories
With recent CLs like [1] adding more fonts into the
testing/resources/fonts directory, there is a risk that this may
interfere with pixel tests that require a specific font. Avoid this
issue by moving the fonts used only for pixel tests into their own
sub-directories, and adjust test_runner.py accordingly.
[1] https://pdfium-review.googlesource.com/113453
Change-Id: Iecb1d948a50bcc1ab83cee27f6cab2403962daf7
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/113590
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/testing/resources/fonts/Ahem.ttf b/testing/resources/fonts/ahem/Ahem.ttf
similarity index 100%
rename from testing/resources/fonts/Ahem.ttf
rename to testing/resources/fonts/ahem/Ahem.ttf
Binary files differ
diff --git a/testing/resources/fonts/SymbolNeu.ttf b/testing/resources/fonts/symbolneu/SymbolNeu.ttf
similarity index 100%
rename from testing/resources/fonts/SymbolNeu.ttf
rename to testing/resources/fonts/symbolneu/SymbolNeu.ttf
Binary files differ
diff --git a/testing/tools/test_runner.py b/testing/tools/test_runner.py
index c52849a..d9212c6 100644
--- a/testing/tools/test_runner.py
+++ b/testing/tools/test_runner.py
@@ -718,8 +718,12 @@
f'--time={TEST_SEED_TIME}'
]
- if 'use_ahem' in self.source_dir or 'use_symbolneu' in self.source_dir:
- cmd_to_run.append(f'--font-dir={_per_process_state.font_dir}')
+ if 'use_ahem' in self.source_dir:
+ font_path = os.path.join(_per_process_state.font_dir, 'ahem')
+ cmd_to_run.append(f'--font-dir={font_path}')
+ elif 'use_symbolneu' in self.source_dir:
+ font_path = os.path.join(_per_process_state.font_dir, 'symbolneu')
+ cmd_to_run.append(f'--font-dir={font_path}')
else:
cmd_to_run.append(f'--font-dir={_per_process_state.third_party_font_dir}')
cmd_to_run.append('--croscore-font-names')
