diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/python-afdko-suppress-copyright-test.patch | |
parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/python-afdko-suppress-copyright-test.patch')
-rw-r--r-- | gnu/packages/patches/python-afdko-suppress-copyright-test.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/gnu/packages/patches/python-afdko-suppress-copyright-test.patch b/gnu/packages/patches/python-afdko-suppress-copyright-test.patch new file mode 100644 index 0000000000..94cd73d5f7 --- /dev/null +++ b/gnu/packages/patches/python-afdko-suppress-copyright-test.patch @@ -0,0 +1,20 @@ +Supress copyright check in tests which can differ based on current year. + + https://github.com/adobe-type-tools/afdko/issues/1589 + +Adapted from upstream: + + https://github.com/adobe-type-tools/afdko/commit/feebd77d9b6507a0b32f837535511be3c94d9c6f + +diff --git a/tests/tx_test.py b/tests/tx_test.py +--- a/tests/tx_test.py ++++ b/tests/tx_test.py +@@ -1246,7 +1246,7 @@ def test_ufo_fontinfo_parsing(file, msg, ret_code): + if (ret_code == 0): + expected_path = generate_ps_dump(expected_path) + output_path = generate_ps_dump(output_path) +- assert differ([expected_path, output_path]) ++ assert differ([expected_path, output_path, '-s'] + PFA_SKIP) + else: + arg = [TOOL, '-t1', '-f', ufo_input_path] + assert subprocess.call(arg) == 6 |