diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-26 17:58:27 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-03-26 17:58:27 +0000 |
commit | 2d8700ca0761ad51b44aea03e8a663a95bd263a8 (patch) | |
tree | 711a49df7a82995c1f1f82e0fa9ef5f69098c79a | |
parent | 6acd64b847895b2aca81e5c1ed3138cb34a735a5 (diff) | |
download | iconv-2d8700ca0761ad51b44aea03e8a663a95bd263a8.tar.gz iconv-2d8700ca0761ad51b44aea03e8a663a95bd263a8.tar.bz2 |
Always add aliases to post targets.
Build module sources when testing (with the wrapper)
Fix testsuite to actually run.
svn path=/trunk/iconv/; revision=6902
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | aliases/Makefile | 4 | ||||
-rw-r--r-- | module/INDEX | 0 | ||||
-rw-r--r-- | module/Makefile | 4 | ||||
-rw-r--r-- | test/GNU/Makefile | 216 | ||||
-rwxr-xr-x | test/GNU/check-stateful | 21 | ||||
-rwxr-xr-x | test/GNU/check-stateless | 28 |
7 files changed, 143 insertions, 134 deletions
@@ -8,6 +8,10 @@ include build/makefiles/Makefile.tools TESTRUNNER := $(PERL) build/testtools/testrunner.pl +ifneq ($(HOST),riscos) + export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/ +endif + # Toolchain flags WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ diff --git a/aliases/Makefile b/aliases/Makefile index ab4a720..119181c 100644 --- a/aliases/Makefile +++ b/aliases/Makefile @@ -18,8 +18,6 @@ $(aliases): $(makealiases) $(addprefix $(DIR)data/, $(aliases_DATA)) $(makealiases): $(addprefix $(DIR), $(makealiases_SRCS)) $(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ $^ -ifeq ($(MAKECMDGOALS),riscos-dist) - POST_TARGETS := $(POST_TARGETS) $(aliases) -endif +POST_TARGETS := $(POST_TARGETS) $(aliases) include build/makefiles/Makefile.subdir diff --git a/module/INDEX b/module/INDEX new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/module/INDEX diff --git a/module/Makefile b/module/Makefile index 192774d..90114cf 100644 --- a/module/Makefile +++ b/module/Makefile @@ -1,5 +1,7 @@ ifeq ($(COMPONENT_TYPE),riscos-module) - DIR_SOURCES := header.cmhg module.c menu.c wrapper.c + DIR_SOURCES := header.cmhg module.c menu.c endif +DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c + include build/makefiles/Makefile.subdir diff --git a/test/GNU/Makefile b/test/GNU/Makefile index 0a91e89..0daa5f6 100644 --- a/test/GNU/Makefile +++ b/test/GNU/Makefile @@ -3,116 +3,116 @@ DIR_TEST_ITEMS := table-from:table-from.c table-to:table-to.c DIR_TEST_ITEMS := $(DIR_TEST_ITEMS) genutf8:genutf8.c gengb18030z:gengb18030z.c testGNU: $(DIR) - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ASCII + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ASCII # /* General multi-byte encodings */ -# $(CURDIR)/$<genutf8 > $(CURDIR)/$<UTF-8.TXT && $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< UTF-8 -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UCS-2BE -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UCS-2LE -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UCS-4BE -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UCS-4LE - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-16 - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-16BE - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-16LE - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-32 - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-32BE - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-32LE - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< UTF-7 +# $(BUILDDIR)/test_GNU_genutf8 > $(CURDIR)/$<UTF-8.TXT && $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< UTF-8 +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UCS-2BE +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UCS-2LE +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UCS-4BE +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UCS-4LE + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-16 + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-16BE + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-16LE + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-32 + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-32BE + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-32LE + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< UTF-7 # /* 8-bit encodings */ - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-1 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-2 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-3 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-4 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-5 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-6 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-7 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-8 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-9 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-10 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-11 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-13 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-14 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-15 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-8859-16 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< KOI8-R -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< KOI8-U -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< KOI8-RU - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1250 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1251 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1252 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1253 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1254 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1255 -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< CP1255 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1256 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1257 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1258 -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< CP1258 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP850 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP862 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP866 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacRoman - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacCentralEurope -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacIceland -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacCroatian -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacRomania - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacCyrillic - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacUkraine -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacGreek -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacTurkish -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacHebrew -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacArabic -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MacThai -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< HP-ROMAN8 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< NEXTSTEP -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ARMSCII-8 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< Georgian-Academy -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< Georgian-PS -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< KOI8-T -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< PT154 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< RK1048 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< MuleLao-1 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP1133 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< TIS-620 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP874 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< VISCII -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< TCVN -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< TCVN + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-1 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-2 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-3 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-4 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-5 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-6 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-7 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-8 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-9 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-10 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-11 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-13 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-14 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-15 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-8859-16 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< KOI8-R +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< KOI8-U +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< KOI8-RU + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1250 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1251 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1252 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1253 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1254 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1255 +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< CP1255 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1256 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1257 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1258 +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< CP1258 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP850 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP862 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP866 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacRoman + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacCentralEurope +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacIceland +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacCroatian +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacRomania + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacCyrillic + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacUkraine +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacGreek +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacTurkish +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacHebrew +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacArabic +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MacThai +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< HP-ROMAN8 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< NEXTSTEP +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ARMSCII-8 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< Georgian-Academy +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< Georgian-PS +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< KOI8-T +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< PT154 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< RK1048 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< MuleLao-1 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP1133 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< TIS-620 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP874 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< VISCII +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< TCVN +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< TCVN # /* CJK character sets */ -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO646-JP -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< JIS_X0201 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< JIS_X0208 # redundant, see EUC-JP -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< JIS_X0212 # redundant, see EUC-JP -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO646-CN -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< GB_2312-80 # redundant, see EUC-CN -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ISO-IR-165 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< KSC_5601 # redundant, see EUC-KR +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO646-JP +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< JIS_X0201 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< JIS_X0208 # redundant, see EUC-JP +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< JIS_X0212 # redundant, see EUC-JP +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO646-CN +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< GB_2312-80 # redundant, see EUC-CN +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< ISO-IR-165 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< KSC_5601 # redundant, see EUC-KR # /* CJK encodings */ - -$(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< EUC-JP - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< SHIFT_JIS -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP932 - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< ISO-2022-JP - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< ISO-2022-JP-2 - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< ISO-2022-JP-1 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< EUC-CN -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< GBK -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP936 -# { cat $(CURDIR)/$<GB18030-BMP.TXT ; $(CURDIR)/$<gengb18030z ; } | sort > $(CURDIR)/$<GB18030.TXT && $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< GB18030 - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< ISO-2022-CN - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< ISO-2022-CN-EXT -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< HZ -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< EUC-TW - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< BIG5 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP950 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< BIG5-HKSCS:1999 -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< BIG5-HKSCS:1999 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< BIG5-HKSCS:2001 -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< BIG5-HKSCS:2001 -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< BIG5-HKSCS:2004 -# $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< BIG5-HKSCS:2004 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< EUC-KR -# $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< CP949 - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< JOHAB - $(CURDIR)/$<check-stateful $(CURDIR) $(CURDIR)/$< ISO-2022-KR + -$(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< EUC-JP + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< SHIFT_JIS +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP932 + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< ISO-2022-JP + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< ISO-2022-JP-2 + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< ISO-2022-JP-1 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< EUC-CN +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< GBK +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP936 +# { cat $(CURDIR)/$<GB18030-BMP.TXT ; $(CURDIR)/$<test_GNU_gengb18030z ; } | sort > $(CURDIR)/$<GB18030.TXT && $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< GB18030 + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< ISO-2022-CN + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< ISO-2022-CN-EXT +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< HZ +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< EUC-TW + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< BIG5 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP950 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< BIG5-HKSCS:1999 +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< BIG5-HKSCS:1999 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< BIG5-HKSCS:2001 +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< BIG5-HKSCS:2001 +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< BIG5-HKSCS:2004 +# $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< BIG5-HKSCS:2004 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< EUC-KR +# $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< CP949 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< JOHAB + $(CURDIR)/$<check-stateful $(BUILDDIR) "$(EXEEXT)" $(CURDIR)/$< ISO-2022-KR # /* transliteration */ # $(CURDIR)/$<check-translit $(CURDIR)/$< Quotes UTF-8 ISO-8859-1 # $(CURDIR)/$<check-translit $(CURDIR)/$< Quotes UTF-8 ASCII @@ -157,8 +157,10 @@ testGNU: $(DIR) # $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< BIG5-2003 # $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< TDS565 # $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< ATARIST - $(CURDIR)/$<check-stateless $(CURDIR) $(CURDIR)/$< X-ACORN-LATIN1 + $(CURDIR)/$<check-stateless $(BUILDDIR) $(CURDIR)/$< X-ACORN-LATIN1 TEST_TARGETS := $(TEST_TARGETS) testGNU +DISTCLEAN_ITEMS := $(DISTCLEAN_ITEMS) $(DIR)/UTF-8.TXT $(DIR)/GB18030.TXT + include build/makefiles/Makefile.subdir diff --git a/test/GNU/check-stateful b/test/GNU/check-stateful index 75bcac7..4fdb0dd 100755 --- a/test/GNU/check-stateful +++ b/test/GNU/check-stateful @@ -1,28 +1,29 @@ #!/usr/bin/perl # Simple check of a stateful encoding. -# Usage: check-stateful TOP SRCDIR CHARSET +# Usage: check-stateful BUILDDIR SRCDIR CHARSET use warnings; use strict; if (@ARGV < 3) { - print "Usage: check-stateful <top> <srcdir> <charset>\n"; + print "Usage: check-stateful <builddir> <exeext> <srcdir> <charset>\n"; exit; } -my $top = shift @ARGV; -my $srcdir = shift @ARGV; -my $charset = shift @ARGV; +my $builddir = shift @ARGV; +my $exeext = shift @ARGV; +my $srcdir = shift @ARGV; +my $charset = shift @ARGV; # charset, modified for use in filenames. my $charsetf = $charset; $charsetf =~ s/:/-/g; -command("$top/Iconv -f $charset -t UTF-8 -o $srcdir/tmp-snippet $srcdir/$charsetf-snippet"); -command("cmp $srcdir/$charsetf-snippet.UTF-8 $srcdir/tmp-snippet"); -command("$top/Iconv -f UTF-8 -t $charset -o $srcdir/tmp-snippet $srcdir/$charsetf-snippet.UTF-8"); -command("cmp $srcdir/$charsetf-snippet $srcdir/tmp-snippet"); -command("rm -f $srcdir/tmp-snippet"); +command("$builddir/module_iconv$exeext -f $charset -t UTF-8 -o $builddir/tmp-snippet $srcdir/$charsetf-snippet"); +command("cmp $srcdir/$charsetf-snippet.UTF-8 $builddir/tmp-snippet"); +command("$builddir/module_iconv$exeext -f UTF-8 -t $charset -o $builddir/tmp-snippet $srcdir/$charsetf-snippet.UTF-8"); +command("cmp $srcdir/$charsetf-snippet $builddir/tmp-snippet"); +command("rm -f $builddir/tmp-snippet"); sub command { my $cmd = shift; diff --git a/test/GNU/check-stateless b/test/GNU/check-stateless index 42479ed..23b5c1b 100755 --- a/test/GNU/check-stateless +++ b/test/GNU/check-stateless @@ -1,43 +1,45 @@ #!/usr/bin/perl # Complete check of a stateless encoding. -# Usage: check-stateless TOP SRCDIR CHARSET +# Usage: check-stateless BUILDDIR SRCDIR CHARSET use warnings; use strict; if (@ARGV < 3) { - print "Usage: check-stateless <top> <srcdir> <charset\n"; + print "Usage: check-stateless <builddir> <srcdir> <charset>\n"; exit; } -my $top = shift @ARGV; -my $srcdir = shift @ARGV; -my $charset = shift @ARGV; +my $builddir = shift @ARGV; +my $srcdir = shift @ARGV; +my $charset = shift @ARGV; + +my $prefix = $builddir . "/test_GNU_"; # charset, modified for use in filenames. my $charsetf = $charset; $charsetf =~ s/:/-/g; # iconv in one direction. -command("$srcdir/table-from $charset > $srcdir/tmp-$charsetf.TXT"); +command("${prefix}table-from $charset > $builddir/tmp-$charsetf.TXT"); # iconv in the other direction. -command("$srcdir/table-to $charset | sort > $srcdir/tmp-$charsetf.INVERSE.TXT"); +command("${prefix}table-to $charset | sort > $builddir/tmp-$charsetf.INVERSE.TXT"); # Check 1: charmap and iconv forward should be identical. -command("cmp $srcdir/$charsetf.TXT $srcdir/tmp-$charsetf.TXT 2> /dev/null"); +command("cmp $srcdir/$charsetf.TXT $builddir/tmp-$charsetf.TXT 2> /dev/null"); # Check 2: the difference between the charmap and iconv backward. -command("sed -e '/ .* 0x/d' < $srcdir/$charsetf.TXT > $srcdir/tmp-noprecomposed-$charsetf.TXT"); +command("sed -e '/ .* 0x/d' < $srcdir/$charsetf.TXT > $builddir/tmp-noprecomposed-$charsetf.TXT"); if (-f "$srcdir/$charsetf.IRREVERSIBLE.TXT") { - command("cat $srcdir/tmp-noprecomposed-$charsetf.TXT $srcdir/$charsetf.IRREVERSIBLE.TXT | sort | uniq -u > $srcdir/tmp-orig-$charsetf.INVERSE.TXT"); + command("cat $builddir/tmp-noprecomposed-$charsetf.TXT $srcdir/$charsetf.IRREVERSIBLE.TXT | sort | uniq -u > $builddir/tmp-orig-$charsetf.INVERSE.TXT"); } else { - command("cp $srcdir/tmp-noprecomposed-$charsetf.TXT $srcdir/tmp-orig-$charsetf.INVERSE.TXT"); + command("cp $builddir/tmp-noprecomposed-$charsetf.TXT $builddir/tmp-orig-$charsetf.INVERSE.TXT"); } -command("cmp $srcdir/tmp-orig-$charsetf.INVERSE.TXT $srcdir/tmp-$charsetf.INVERSE.TXT 2> /dev/null"); +command("cmp $builddir/tmp-orig-$charsetf.INVERSE.TXT $builddir/tmp-$charsetf.INVERSE.TXT 2> /dev/null"); -command("rm -f $srcdir/tmp-$charsetf.TXT $srcdir/tmp-$charsetf.INVERSE.TXT $srcdir/tmp-noprecomposed-$charsetf.TXT $srcdir/tmp-orig-$charsetf.INVERSE.TXT"); +command("rm -f $builddir/tmp-$charsetf.TXT $builddir/tmp-$charsetf.INVERSE.TXT $builddir/tmp-noprecomposed-$charsetf.TXT $builddir/tmp-orig-$charsetf.INVERSE.TXT"); sub command { my $cmd = shift; |