ICU-9948 no longer see a crash, think it was fixed by other bugs. bumped the class table. enabled letest to run by default (finally). fixed pcheck to output status.
X-SVN-Rev: 35384
This commit is contained in:
parent
4c6a2ed3f7
commit
0b703647fd
@ -1,5 +1,5 @@
|
|||||||
## Makefile.in for ICU tests
|
## Makefile.in for ICU tests
|
||||||
## Copyright (c) 1999-2013, International Business Machines Corporation and
|
## Copyright (c) 1999-2014, International Business Machines Corporation and
|
||||||
## others. All Rights Reserved.
|
## others. All Rights Reserved.
|
||||||
|
|
||||||
## Source directory information
|
## Source directory information
|
||||||
@ -14,6 +14,7 @@ include $(top_builddir)/icudefs.mk
|
|||||||
subdir = test
|
subdir = test
|
||||||
|
|
||||||
@ICUIO_TRUE@IOTEST = iotest
|
@ICUIO_TRUE@IOTEST = iotest
|
||||||
|
@LAYOUT_TRUE@LETEST = letest
|
||||||
|
|
||||||
# status dir
|
# status dir
|
||||||
STATUS_TMP = tmp
|
STATUS_TMP = tmp
|
||||||
@ -22,7 +23,7 @@ STATUS_FULL = $(shell pwd)/$(STATUS_TMP)
|
|||||||
## Files to remove for 'make clean'
|
## Files to remove for 'make clean'
|
||||||
CLEANFILES = *~ $(STATUS_TMP)
|
CLEANFILES = *~ $(STATUS_TMP)
|
||||||
|
|
||||||
SUBDIRS = testdata intltest $(IOTEST) cintltst
|
SUBDIRS = testdata intltest $(IOTEST) cintltst $(LETEST)
|
||||||
|
|
||||||
## List of phony targets
|
## List of phony targets
|
||||||
.PHONY : everything all all-local all-recursive install install-local \
|
.PHONY : everything all all-local all-recursive install install-local \
|
||||||
@ -121,15 +122,24 @@ pcheck_setup: testdata
|
|||||||
@echo Beginning parallel make. Output may be interleaved!
|
@echo Beginning parallel make. Output may be interleaved!
|
||||||
|
|
||||||
$(STATUS_FULL)/status.$(STATUS_NUM).deleteme.%: pcheck_setup
|
$(STATUS_FULL)/status.$(STATUS_NUM).deleteme.%: pcheck_setup
|
||||||
@$(MAKE) -C $* TEST_STATUS_FILE=$@ check || ( echo "FAILED: $* (other tests may still be running..)" ; touch $@.FAIL ; false )
|
-@$(MAKE) -C $* TEST_STATUS_FILE=$@ check || ( echo "FAILED: $* (other tests may still be running..)" ; touch $@ ; cp $@ $@.FAIL ; false )
|
||||||
-@touch $@.PASS
|
-@[ ! -f $@.FAIL ] && touch $@.PASS && echo "PASSED: $* (other tests may still be running..)"
|
||||||
-@echo "PASSED: $* (other tests may still be running..)"
|
-@touch $@
|
||||||
|
|
||||||
# print out status
|
# print out status
|
||||||
pcheck: $(STATUS_FILES)
|
pcheck: $(STATUS_FILES)
|
||||||
@goods= ; \
|
@goods= ; \
|
||||||
bads= ; \
|
bads= ; \
|
||||||
echo "---------------"; \
|
echo "----------------------------------------"; \
|
||||||
|
for subdir in $(SUBDIRS); do \
|
||||||
|
if [ -s "$(MYSTATUS_R).$$subdir" ]; then \
|
||||||
|
echo "-------------" ; \
|
||||||
|
echo "| *** FAILING TEST SUMMARY FOR: $$subdir " ; \
|
||||||
|
cat "$(MYSTATUS_R).$$subdir" ; \
|
||||||
|
echo "| *** END FAILING TEST SUMMARY FOR: $$subdir" ; \
|
||||||
|
$(RMV) "$(MYSTATUS_R).$$subdir" ; \
|
||||||
|
fi; \
|
||||||
|
done; \
|
||||||
for subdir in $(SUBDIRS); do \
|
for subdir in $(SUBDIRS); do \
|
||||||
if [ -f "$(MYSTATUS_R).$$subdir.FAIL" ]; \
|
if [ -f "$(MYSTATUS_R).$$subdir.FAIL" ]; \
|
||||||
then \
|
then \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
## Makefile.in for ICU - test/letest
|
## Makefile.in for ICU - test/letest
|
||||||
## Copyright (c) 2001-2013, International Business Machines Corporation and
|
## Copyright (c) 2001-2014, International Business Machines Corporation and
|
||||||
## others. All Rights Reserved.
|
## others. All Rights Reserved.
|
||||||
|
|
||||||
## Source directory information
|
## Source directory information
|
||||||
@ -46,7 +46,7 @@ DEPS = $(OBJECTS:.o=.d)
|
|||||||
|
|
||||||
## List of phony targets
|
## List of phony targets
|
||||||
.PHONY : all all-local install install-local clean clean-local \
|
.PHONY : all all-local install install-local clean clean-local \
|
||||||
distclean distclean-local dist dist-local check check-local
|
distclean distclean-local dist dist-local check check-local xcheck xcheck-local
|
||||||
|
|
||||||
## Clear suffix list
|
## Clear suffix list
|
||||||
.SUFFIXES :
|
.SUFFIXES :
|
||||||
@ -58,6 +58,7 @@ clean: clean-local
|
|||||||
distclean : distclean-local
|
distclean : distclean-local
|
||||||
dist: dist-local
|
dist: dist-local
|
||||||
check: all check-local
|
check: all check-local
|
||||||
|
xcheck: all xcheck-local
|
||||||
|
|
||||||
all-local: $(TESTTARGET)
|
all-local: $(TESTTARGET)
|
||||||
|
|
||||||
@ -73,7 +74,11 @@ distclean-local: clean-local
|
|||||||
$(RMV) Makefile
|
$(RMV) Makefile
|
||||||
|
|
||||||
check-local: all-local
|
check-local: all-local
|
||||||
$(INVOKE) ./$(TESTTARGET)
|
$(INVOKE) ./$(TESTTARGET) $(TEST_OUTPUT_OPTS) $(LETEST_OPTS)
|
||||||
|
|
||||||
|
TESTXML=$(top_builddir)/test-$(TESTTARGET).xml
|
||||||
|
xcheck-local: all-local
|
||||||
|
$(INVOKE) ./$(TESTTARGET) $(TEST_OUTPUT_OPTS) $(LETEST_OPTS) -x $(TESTXML)
|
||||||
|
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
cd $(top_builddir) \
|
cd $(top_builddir) \
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Copyright (c) 1999-2013 International Business Machines
|
Copyright (c) 1999-2014 International Business Machines
|
||||||
Corporation and others. All rights reserved.
|
Corporation and others. All rights reserved.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@ -106,6 +106,16 @@
|
|||||||
<test-text>فتح بینچ خلیج شیخ پہنچ</test-text>
|
<test-text>فتح بینچ خلیج شیخ پہنچ</test-text>
|
||||||
</test-case>
|
</test-case>
|
||||||
|
|
||||||
|
<test-case id="Malayalam Crash Test 9948" script="mlym">
|
||||||
|
<test-font name="lohit_ml.ttf"/>
|
||||||
|
<test-text>ഹോം</test-text>
|
||||||
|
</test-case>
|
||||||
|
|
||||||
|
<test-case id="Malayalam Crash II" script="mlym">
|
||||||
|
<test-font name="LucidaSansRegular.ttf"/>
|
||||||
|
<test-text>റ്1്',s</test-text>
|
||||||
|
</test-case>
|
||||||
|
|
||||||
<test-case id="Malayalam Samvruthokaram Test" script="mlym">
|
<test-case id="Malayalam Samvruthokaram Test" script="mlym">
|
||||||
<test-font name="lohit_ml.ttf"/>
|
<test-font name="lohit_ml.ttf"/>
|
||||||
<test-text>ണു്</test-text>
|
<test-text>ണു്</test-text>
|
||||||
|
43
icu4c/source/test/testdata/letest.xml
vendored
43
icu4c/source/test/testdata/letest.xml
vendored
@ -1,14 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Copyright (c) 1999-2013 International Business Machines
|
Copyright (c) 1999-2014 International Business Machines
|
||||||
Corporation and others. All rights reserved.
|
Corporation and others. All rights reserved.
|
||||||
|
|
||||||
WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT
|
WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT
|
||||||
UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
|
UNLESS YOU REALLY KNOW WHAT YOU'RE DOING.
|
||||||
|
|
||||||
file name: letest.xml
|
file name: letest.xml
|
||||||
generated on: 08/01/2013 02:47:21 PM PDT
|
generated on: 03/07/2014 04:48:16 PM PST
|
||||||
generated by: gendata.cpp
|
generated by: gendata.cpp
|
||||||
-->
|
-->
|
||||||
|
|
||||||
@ -1251,6 +1251,45 @@
|
|||||||
</result-positions>
|
</result-positions>
|
||||||
</test-case>
|
</test-case>
|
||||||
|
|
||||||
|
<test-case id="Malayalam Crash Test 9948" script="mlym">
|
||||||
|
<test-font name="lohit_ml.ttf" version="Version 1.00" checksum="0x66CB0B82" rchecksum="0x002EEBD8"/>
|
||||||
|
|
||||||
|
<test-text>ഹോം</test-text>
|
||||||
|
|
||||||
|
<result-glyphs>
|
||||||
|
0x00000040, 0x00000038, 0x00000039, 0x00000005
|
||||||
|
</result-glyphs>
|
||||||
|
|
||||||
|
<result-indices>
|
||||||
|
0x00000001, 0x00000000, 0x00000001, 0x00000002
|
||||||
|
</result-indices>
|
||||||
|
|
||||||
|
<result-positions>
|
||||||
|
0.000000, 0.000000, 6.386719, 0.000000, 20.660156, 0.000000, 26.496094, 0.000000,
|
||||||
|
32.742188, 0.000000
|
||||||
|
</result-positions>
|
||||||
|
</test-case>
|
||||||
|
|
||||||
|
<test-case id="Malayalam Crash II" script="mlym">
|
||||||
|
<test-font name="LucidaSansRegular.ttf" version="Version 1.20 - October 2000" checksum="0xF5D9BA6D" rchecksum="0x029B644F"/>
|
||||||
|
|
||||||
|
<test-text>റ്1്',s</test-text>
|
||||||
|
|
||||||
|
<result-glyphs>
|
||||||
|
0x00000000, 0x00000000, 0x00000014, 0x00000956, 0x00000000, 0x0000000A, 0x0000000F, 0x00000056
|
||||||
|
</result-glyphs>
|
||||||
|
|
||||||
|
<result-indices>
|
||||||
|
0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000004, 0x00000005, 0x00000006
|
||||||
|
</result-indices>
|
||||||
|
|
||||||
|
<result-positions>
|
||||||
|
0.000000, 0.000000, 9.000000, 0.000000, 9.000000, 0.000000, 16.587891, 0.000000,
|
||||||
|
16.587891, 0.000000, 25.587891, 0.000000, 28.335938, 0.000000, 47.132812, 0.000000,
|
||||||
|
38.250000, 0.000000
|
||||||
|
</result-positions>
|
||||||
|
</test-case>
|
||||||
|
|
||||||
<test-case id="Malayalam Samvruthokaram Test" script="mlym">
|
<test-case id="Malayalam Samvruthokaram Test" script="mlym">
|
||||||
<test-font name="lohit_ml.ttf" version="Version 1.00" checksum="0x66CB0B82" rchecksum="0x002EEBD8"/>
|
<test-font name="lohit_ml.ttf" version="Version 1.00" checksum="0x66CB0B82" rchecksum="0x002EEBD8"/>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user