diff options
| -rw-r--r-- | test/Makefile.am | 9 | ||||
| -rw-r--r-- | test/out.expected | 12 | ||||
| -rw-r--r-- | test/out271.expected | 8 | ||||
| -rw-r--r-- | test/run-test271.sh | 24 |
4 files changed, 6 insertions, 47 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 13329810..3eb6940b 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,8 +1,4 @@ -if FREETYPE_PCF_LONG_FAMILY_NAMES -check_SCRIPTS=run-test271.sh -else check_SCRIPTS=run-test.sh -endif TEST_EXTENSIONS = \ .sh \ $(NULL) @@ -13,12 +9,7 @@ AM_TESTS_ENVIRONMENT= \ $(NULL) SH_LOG_COMPILER = sh - -if FREETYPE_PCF_LONG_FAMILY_NAMES -TESTS=run-test271.sh -else TESTS=run-test.sh -endif TESTDATA=4x6.pcf 8x16.pcf out.expected out271.expected fonts.conf.in diff --git a/test/out.expected b/test/out.expected index 39634c50..d0697236 100644 --- a/test/out.expected +++ b/test/out.expected @@ -1,8 +1,8 @@ -Fixed:pixelsize=16 -Fixed:pixelsize=6 +Misc Fixed:pixelsize=6 +Sony Fixed:pixelsize=16 = -Fixed:pixelsize=16 -Fixed:pixelsize=6 +Misc Fixed:pixelsize=6 +Sony Fixed:pixelsize=16 = -Fixed:pixelsize=16 -Fixed:pixelsize=6 +Misc Fixed:pixelsize=6 +Sony Fixed:pixelsize=16 diff --git a/test/out271.expected b/test/out271.expected deleted file mode 100644 index d0697236..00000000 --- a/test/out271.expected +++ /dev/null @@ -1,8 +0,0 @@ -Misc Fixed:pixelsize=6 -Sony Fixed:pixelsize=16 -= -Misc Fixed:pixelsize=6 -Sony Fixed:pixelsize=16 -= -Misc Fixed:pixelsize=6 -Sony Fixed:pixelsize=16 diff --git a/test/run-test271.sh b/test/run-test271.sh deleted file mode 100644 index 5c85a672..00000000 --- a/test/run-test271.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# fontconfig/test/run-test271.sh -# -# Copyright © 2000 Keith Packard -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of the author(s) not be used in -# advertising or publicity pertaining to distribution of the software without -# specific, written prior permission. The authors make no -# representations about the suitability of this software for any purpose. It -# is provided "as is" without express or implied warranty. -# -# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR -# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - -EXPECTED=out271.expected sh `dirname $0`/run-test.sh |