diff options
| author | James Godfrey-Kittle <jamesgk@google.com> | 2015-02-26 18:33:08 -0800 |
|---|---|---|
| committer | James Godfrey-Kittle <jamesgk@google.com> | 2015-04-16 12:16:31 -0700 |
| commit | 82a46da3a3f10e7ab2bc96747a66cbf3031b4c5e (patch) | |
| tree | 22e6e6c0bc2474a8dd462effa32e9fefe3b5d892 | |
| parent | 68c02d5ae8416b1b67148da702ee0ae57af0f764 (diff) | |
Update font paths in tests to look in out/v2.
This is the output directory for fonts created with this branch since r07c436525dd3.
| -rwxr-xr-x | scripts/coverage_test.py | 4 | ||||
| -rwxr-xr-x | scripts/run_android_tests.py | 2 | ||||
| -rwxr-xr-x | scripts/run_exhaustive_tests.py | 4 | ||||
| -rwxr-xr-x | scripts/run_general_tests.py | 2 | ||||
| -rwxr-xr-x | scripts/run_web_tests.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/scripts/coverage_test.py b/scripts/coverage_test.py index 92974c7..2cc19b6 100755 --- a/scripts/coverage_test.py +++ b/scripts/coverage_test.py @@ -23,8 +23,8 @@ from nototools import unicode_data def load_fonts(): """Load all fonts built for Android.""" - all_fonts = (glob.glob('out/RobotoTTF/*.ttf') - + glob.glob('out/RobotoCondensedTTF/*.ttf')) + all_fonts = (glob.glob('out/v2/RobotoTTF/*.ttf') + + glob.glob('out/v2/RobotoCondensedTTF/*.ttf')) all_fonts = [ttLib.TTFont(font) for font in all_fonts] return all_fonts diff --git a/scripts/run_android_tests.py b/scripts/run_android_tests.py index e277268..6b47177 100755 --- a/scripts/run_android_tests.py +++ b/scripts/run_android_tests.py @@ -8,7 +8,7 @@ from nototools import coverage import common_tests FONTS = common_tests.load_fonts( - ['out/android/*.ttf'], + ['out/v2/android/*.ttf'], expected_count=18) class TestItalicAngle(common_tests.TestItalicAngle): diff --git a/scripts/run_exhaustive_tests.py b/scripts/run_exhaustive_tests.py index 9bf7011..ddec549 100755 --- a/scripts/run_exhaustive_tests.py +++ b/scripts/run_exhaustive_tests.py @@ -12,8 +12,8 @@ import layout def load_fonts(): """Load all major fonts.""" - all_font_files = (glob.glob('out/RobotoTTF/*.ttf') - + glob.glob('out/RobotoCondensedTTF/*.ttf')) + all_font_files = (glob.glob('out/v2/RobotoTTF/*.ttf') + + glob.glob('out/v2/RobotoCondensedTTF/*.ttf')) all_fonts = [ttLib.TTFont(font) for font in all_font_files] assert len(all_font_files) == 18 return all_font_files, all_fonts diff --git a/scripts/run_general_tests.py b/scripts/run_general_tests.py index 8b56305..f4b984c 100755 --- a/scripts/run_general_tests.py +++ b/scripts/run_general_tests.py @@ -6,7 +6,7 @@ import unittest import common_tests FONTS = common_tests.load_fonts( - ['out/RobotoTTF/*.ttf', 'out/RobotoCondensedTTF/*.ttf'], + ['out/v2/RobotoTTF/*.ttf', 'out/v2/RobotoCondensedTTF/*.ttf'], expected_count=18) class TestItalicAngle(common_tests.TestItalicAngle): diff --git a/scripts/run_web_tests.py b/scripts/run_web_tests.py index 3bcfd97..a8ff149 100755 --- a/scripts/run_web_tests.py +++ b/scripts/run_web_tests.py @@ -8,7 +8,7 @@ from nototools import font_data import common_tests FONTS = common_tests.load_fonts( - ['out/web/*.ttf'], + ['out/v2/web/*.ttf'], expected_count=18) class TestItalicAngle(common_tests.TestItalicAngle): |