summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/run_general_tests.py18
-rwxr-xr-xscripts/run_web_tests.py4
2 files changed, 18 insertions, 4 deletions
diff --git a/scripts/run_general_tests.py b/scripts/run_general_tests.py
index ddfae17..1a007d2 100755
--- a/scripts/run_general_tests.py
+++ b/scripts/run_general_tests.py
@@ -96,8 +96,22 @@ class TestVerticalMetrics(font_tests.TestVerticalMetrics):
class TestGlyphAreas(font_tests.TestGlyphAreas):
- loaded_fonts = UFOS
- masters = UFO_MASTERS
+ master_weights_to_test = ['Thin', 'Bold']
+ instance_weights_to_test = ['Thin', 'Regular', 'Bold']
+ exclude = ['Condensed', 'Italic']
+
+ master_glyph_sets = [
+ f.replace('_', '-') for f in UFO_MASTERS[0]], UFO_MASTERS[1]
+ instance_glyph_sets = FONTS[0], [f.getGlyphSet() for f in FONTS[1]]
+
+ master_glyphs_to_test = UFO_MASTERS[1][0].keys()
+ instance_glyphs_to_test = FONTS[1][0].getGlyphOrder()
+
+ #TODO maybe fix masters so that whitelisting isn't necessary
+ whitelist = [
+ 'uni0488', # offset 20 units b/w masters, interpolated points are off
+ 'uni2050' # has flipped component, so contour is backwards in master
+ ]
if __name__ == '__main__':
diff --git a/scripts/run_web_tests.py b/scripts/run_web_tests.py
index 4f051bf..5d3fd34 100755
--- a/scripts/run_web_tests.py
+++ b/scripts/run_web_tests.py
@@ -53,8 +53,8 @@ class TestNames(font_tests.TestNames):
mark_heavier_as_bold = True
expected_copyright = 'Copyright 2011 Google Inc. All Rights Reserved.'
- def expected_unique_id(self, full_name):
- return full_name
+ def expected_unique_id(self, family, style):
+ return family + ' ' + style
class TestDigitWidths(font_tests.TestDigitWidths):