In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/fa951d2c91f349f100412a541b9fa2f6122af080?hp=90946601a1f11f0970ba113ec95ce08c20220813>
- Log ----------------------------------------------------------------- commit fa951d2c91f349f100412a541b9fa2f6122af080 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Dec 3 06:47:12 2016 +0000 Update Test-Simple to CPAN version 1.302067 [DELTA] 1.302067 2016-11-23 07:37:56-08:00 America/Los_Angeles - Fix context test for recent blead. 1.302066 2016-11-08 07:58:39-08:00 America/Los_Angeles (TRIAL RELEASE) - Handle cases where SysV IPC can be available but not enabled - Import 'context' into Test2::IPC, it is used by 'cull' - Propogate warnings settings to use_ok (#736) 1.302065 2016-10-30 11:54:37-07:00 America/Los_Angeles (TRIAL RELEASE) - Set the TEST_ACTIVE env var to true - Set the TEST2_ACTIVE env var to true - Fix the oldest bug still in the bug list (#6) This fixes cmp_ok output is some confusing cases - Update travis config - Add missing author deps - Fix handling of negative pid's on windows - Add can() to Test::Tester::Delegate (despite deprecation) - Fix some minor test issues 1.302064 2016-10-24 21:03:24-07:00 America/Los_Angeles (TRIAL RELEASE) - Repo management improvements - Better handling of info vs diag in ->send_event - Fix test that used 'parent' - Better handling of non-bumping failures (#728) 1.302063 2016-10-23 21:31:20-07:00 America/Los_Angeles (TRIAL RELEASE) - Fix double release when 'throw' is used in context_do() M MANIFEST M Porting/Maintainers.pl M cpan/Test-Simple/lib/Test/Builder.pm M cpan/Test-Simple/lib/Test/Builder/Formatter.pm M cpan/Test-Simple/lib/Test/Builder/Module.pm M cpan/Test-Simple/lib/Test/Builder/Tester.pm M cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm M cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm M cpan/Test-Simple/lib/Test/More.pm M cpan/Test-Simple/lib/Test/Simple.pm M cpan/Test-Simple/lib/Test/Tester.pm M cpan/Test-Simple/lib/Test/Tester/Capture.pm M cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm M cpan/Test-Simple/lib/Test/Tester/Delegate.pm M cpan/Test-Simple/lib/Test/use/ok.pm M cpan/Test-Simple/lib/Test2.pm M cpan/Test-Simple/lib/Test2/API.pm M cpan/Test-Simple/lib/Test2/API/Breakage.pm M cpan/Test-Simple/lib/Test2/API/Context.pm M cpan/Test-Simple/lib/Test2/API/Instance.pm M cpan/Test-Simple/lib/Test2/API/Stack.pm M cpan/Test-Simple/lib/Test2/Event.pm M cpan/Test-Simple/lib/Test2/Event/Bail.pm M cpan/Test-Simple/lib/Test2/Event/Diag.pm M cpan/Test-Simple/lib/Test2/Event/Exception.pm M cpan/Test-Simple/lib/Test2/Event/Generic.pm M cpan/Test-Simple/lib/Test2/Event/Info.pm M cpan/Test-Simple/lib/Test2/Event/Note.pm M cpan/Test-Simple/lib/Test2/Event/Ok.pm M cpan/Test-Simple/lib/Test2/Event/Plan.pm M cpan/Test-Simple/lib/Test2/Event/Skip.pm M cpan/Test-Simple/lib/Test2/Event/Subtest.pm M cpan/Test-Simple/lib/Test2/Event/Waiting.pm M cpan/Test-Simple/lib/Test2/Formatter.pm M cpan/Test-Simple/lib/Test2/Formatter/TAP.pm M cpan/Test-Simple/lib/Test2/Hub.pm M cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm M cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm M cpan/Test-Simple/lib/Test2/Hub/Subtest.pm M cpan/Test-Simple/lib/Test2/IPC.pm M cpan/Test-Simple/lib/Test2/IPC/Driver.pm M cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm M cpan/Test-Simple/lib/Test2/Util.pm M cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm M cpan/Test-Simple/lib/Test2/Util/HashBase.pm M cpan/Test-Simple/lib/Test2/Util/Trace.pm M cpan/Test-Simple/lib/ok.pm A cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t A cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t M cpan/Test-Simple/t/Legacy/auto.t M cpan/Test-Simple/t/Legacy/fail-more.t A cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t M cpan/Test-Simple/t/Test2/behavior/Formatter.t M cpan/Test-Simple/t/Test2/modules/Event/Info.t M cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t commit 12389a222086acf35b117d758b1c459ffd88aab4 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Dec 3 06:45:17 2016 +0000 Reconcile Time-HiRes with CPAN release M Porting/Maintainers.pl M dist/Time-HiRes/Changes M dist/Time-HiRes/HiRes.pm commit dad75267efbcaf57f818c0d5c8b51987debda0e6 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Dec 3 06:42:34 2016 +0000 Update Time-Local to CPAN version 1.25 [DELTA] 1.25 2016-11-17 - Reduce memory usage by only loading Config if needed and not importing from Carp. Based on PR #2 from J. Nick Coston. M Porting/Maintainers.pl M cpan/Time-Local/lib/Time/Local.pm commit 3f9b5325f806d70a31185ab3820d13774f527229 Author: Chris 'BinGOs' Williams <[email protected]> Date: Sat Dec 3 06:38:51 2016 +0000 Update Unicode-Collate to CPAN version 1.19 [DELTA] 1.19 Sat Dec 3 09:32:31 2016 - U::C::Locale newly supports locales: he, vo. - locales updated to CLDR 24: az, haw. - locale updated to CLDR 26: et. M MANIFEST M Porting/Maintainers.pl M cpan/Unicode-Collate/Collate.pm M cpan/Unicode-Collate/Collate/CJK/Big5.pm M cpan/Unicode-Collate/Collate/CJK/GB2312.pm M cpan/Unicode-Collate/Collate/CJK/JISX0208.pm M cpan/Unicode-Collate/Collate/CJK/Korean.pm M cpan/Unicode-Collate/Collate/CJK/Pinyin.pm M cpan/Unicode-Collate/Collate/CJK/Stroke.pm M cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm M cpan/Unicode-Collate/Collate/Locale.pm M cpan/Unicode-Collate/Collate/Locale/af.pl M cpan/Unicode-Collate/Collate/Locale/ar.pl M cpan/Unicode-Collate/Collate/Locale/as.pl M cpan/Unicode-Collate/Collate/Locale/az.pl M cpan/Unicode-Collate/Collate/Locale/be.pl M cpan/Unicode-Collate/Collate/Locale/bn.pl M cpan/Unicode-Collate/Collate/Locale/ca.pl M cpan/Unicode-Collate/Collate/Locale/cs.pl M cpan/Unicode-Collate/Collate/Locale/cy.pl M cpan/Unicode-Collate/Collate/Locale/da.pl M cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl M cpan/Unicode-Collate/Collate/Locale/de_phone.pl M cpan/Unicode-Collate/Collate/Locale/ee.pl M cpan/Unicode-Collate/Collate/Locale/eo.pl M cpan/Unicode-Collate/Collate/Locale/es.pl M cpan/Unicode-Collate/Collate/Locale/es_trad.pl M cpan/Unicode-Collate/Collate/Locale/et.pl M cpan/Unicode-Collate/Collate/Locale/fa.pl M cpan/Unicode-Collate/Collate/Locale/fi.pl M cpan/Unicode-Collate/Collate/Locale/fi_phone.pl M cpan/Unicode-Collate/Collate/Locale/fil.pl M cpan/Unicode-Collate/Collate/Locale/fo.pl M cpan/Unicode-Collate/Collate/Locale/fr_ca.pl M cpan/Unicode-Collate/Collate/Locale/gu.pl M cpan/Unicode-Collate/Collate/Locale/ha.pl M cpan/Unicode-Collate/Collate/Locale/haw.pl A cpan/Unicode-Collate/Collate/Locale/he.pl M cpan/Unicode-Collate/Collate/Locale/hi.pl M cpan/Unicode-Collate/Collate/Locale/hr.pl M cpan/Unicode-Collate/Collate/Locale/hu.pl M cpan/Unicode-Collate/Collate/Locale/hy.pl M cpan/Unicode-Collate/Collate/Locale/ig.pl M cpan/Unicode-Collate/Collate/Locale/is.pl M cpan/Unicode-Collate/Collate/Locale/ja.pl M cpan/Unicode-Collate/Collate/Locale/kk.pl M cpan/Unicode-Collate/Collate/Locale/kl.pl M cpan/Unicode-Collate/Collate/Locale/kn.pl M cpan/Unicode-Collate/Collate/Locale/ko.pl M cpan/Unicode-Collate/Collate/Locale/kok.pl M cpan/Unicode-Collate/Collate/Locale/ln.pl M cpan/Unicode-Collate/Collate/Locale/lt.pl M cpan/Unicode-Collate/Collate/Locale/lv.pl M cpan/Unicode-Collate/Collate/Locale/mk.pl M cpan/Unicode-Collate/Collate/Locale/ml.pl M cpan/Unicode-Collate/Collate/Locale/mr.pl M cpan/Unicode-Collate/Collate/Locale/mt.pl M cpan/Unicode-Collate/Collate/Locale/nb.pl M cpan/Unicode-Collate/Collate/Locale/nn.pl M cpan/Unicode-Collate/Collate/Locale/nso.pl M cpan/Unicode-Collate/Collate/Locale/om.pl M cpan/Unicode-Collate/Collate/Locale/or.pl M cpan/Unicode-Collate/Collate/Locale/pa.pl M cpan/Unicode-Collate/Collate/Locale/pl.pl M cpan/Unicode-Collate/Collate/Locale/ro.pl M cpan/Unicode-Collate/Collate/Locale/sa.pl M cpan/Unicode-Collate/Collate/Locale/se.pl M cpan/Unicode-Collate/Collate/Locale/si.pl M cpan/Unicode-Collate/Collate/Locale/si_dict.pl M cpan/Unicode-Collate/Collate/Locale/sk.pl M cpan/Unicode-Collate/Collate/Locale/sl.pl M cpan/Unicode-Collate/Collate/Locale/sq.pl M cpan/Unicode-Collate/Collate/Locale/sr.pl M cpan/Unicode-Collate/Collate/Locale/sv.pl M cpan/Unicode-Collate/Collate/Locale/sv_refo.pl M cpan/Unicode-Collate/Collate/Locale/ta.pl M cpan/Unicode-Collate/Collate/Locale/te.pl M cpan/Unicode-Collate/Collate/Locale/th.pl M cpan/Unicode-Collate/Collate/Locale/tn.pl M cpan/Unicode-Collate/Collate/Locale/to.pl M cpan/Unicode-Collate/Collate/Locale/tr.pl M cpan/Unicode-Collate/Collate/Locale/ug_cyrl.pl M cpan/Unicode-Collate/Collate/Locale/uk.pl M cpan/Unicode-Collate/Collate/Locale/ur.pl M cpan/Unicode-Collate/Collate/Locale/vi.pl A cpan/Unicode-Collate/Collate/Locale/vo.pl M cpan/Unicode-Collate/Collate/Locale/wae.pl M cpan/Unicode-Collate/Collate/Locale/wo.pl M cpan/Unicode-Collate/Collate/Locale/yo.pl M cpan/Unicode-Collate/Collate/Locale/zh.pl M cpan/Unicode-Collate/Collate/Locale/zh_big5.pl M cpan/Unicode-Collate/Collate/Locale/zh_gb.pl M cpan/Unicode-Collate/Collate/Locale/zh_pin.pl M cpan/Unicode-Collate/Collate/Locale/zh_strk.pl M cpan/Unicode-Collate/Collate/Locale/zh_zhu.pl M cpan/Unicode-Collate/t/loc_az.t M cpan/Unicode-Collate/t/loc_cs.t M cpan/Unicode-Collate/t/loc_de.t M cpan/Unicode-Collate/t/loc_deat.t M cpan/Unicode-Collate/t/loc_deph.t M cpan/Unicode-Collate/t/loc_es.t M cpan/Unicode-Collate/t/loc_estr.t M cpan/Unicode-Collate/t/loc_et.t M cpan/Unicode-Collate/t/loc_ha.t M cpan/Unicode-Collate/t/loc_haw.t A cpan/Unicode-Collate/t/loc_he.t M cpan/Unicode-Collate/t/loc_ig.t A cpan/Unicode-Collate/t/loc_vo.t ----------------------------------------------------------------------- Summary of changes: MANIFEST | 7 ++ Porting/Maintainers.pl | 8 +- cpan/Test-Simple/lib/Test/Builder.pm | 34 ++++++- cpan/Test-Simple/lib/Test/Builder/Formatter.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Module.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm | 2 +- cpan/Test-Simple/lib/Test/More.pm | 13 ++- cpan/Test-Simple/lib/Test/Simple.pm | 2 +- cpan/Test-Simple/lib/Test/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/Tester/Capture.pm | 2 +- cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm | 2 +- cpan/Test-Simple/lib/Test/Tester/Delegate.pm | 12 ++- cpan/Test-Simple/lib/Test/use/ok.pm | 2 +- cpan/Test-Simple/lib/Test2.pm | 12 +-- cpan/Test-Simple/lib/Test2/API.pm | 7 +- cpan/Test-Simple/lib/Test2/API/Breakage.pm | 2 +- cpan/Test-Simple/lib/Test2/API/Context.pm | 11 ++- cpan/Test-Simple/lib/Test2/API/Instance.pm | 10 +- cpan/Test-Simple/lib/Test2/API/Stack.pm | 2 +- cpan/Test-Simple/lib/Test2/Event.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Bail.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Diag.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Exception.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Generic.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Info.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Note.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Ok.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Plan.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Skip.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Subtest.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Waiting.pm | 2 +- cpan/Test-Simple/lib/Test2/Formatter.pm | 2 +- cpan/Test-Simple/lib/Test2/Formatter/TAP.pm | 2 +- cpan/Test-Simple/lib/Test2/Hub.pm | 14 +-- cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm | 2 +- .../lib/Test2/Hub/Interceptor/Terminator.pm | 2 +- cpan/Test-Simple/lib/Test2/Hub/Subtest.pm | 2 +- cpan/Test-Simple/lib/Test2/IPC.pm | 3 +- cpan/Test-Simple/lib/Test2/IPC/Driver.pm | 2 +- cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm | 17 ++-- cpan/Test-Simple/lib/Test2/Util.pm | 6 +- cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm | 2 +- cpan/Test-Simple/lib/Test2/Util/HashBase.pm | 2 +- cpan/Test-Simple/lib/Test2/Util/Trace.pm | 2 +- cpan/Test-Simple/lib/ok.pm | 2 +- cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t | 17 ++++ cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t | 31 ++++++ cpan/Test-Simple/t/Legacy/auto.t | 8 +- cpan/Test-Simple/t/Legacy/fail-more.t | 11 +-- .../t/Legacy_And_Test2/hidden_warnings.t | 20 ++++ cpan/Test-Simple/t/Test2/behavior/Formatter.t | 2 +- cpan/Test-Simple/t/Test2/modules/Event/Info.t | 6 ++ .../Test-Simple/t/Test2/modules/IPC/Driver/Files.t | 71 +++++++------- cpan/Time-Local/lib/Time/Local.pm | 59 ++++++++---- cpan/Unicode-Collate/Collate.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/Big5.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/GB2312.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/JISX0208.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/Korean.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/Pinyin.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/Stroke.pm | 2 +- cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm | 2 +- cpan/Unicode-Collate/Collate/Locale.pm | 47 ++++----- cpan/Unicode-Collate/Collate/Locale/af.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ar.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/as.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/az.pl | 4 +- cpan/Unicode-Collate/Collate/Locale/be.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/bn.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ca.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/cs.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/cy.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/da.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/de_phone.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ee.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/eo.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/es.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/es_trad.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/et.pl | 4 +- cpan/Unicode-Collate/Collate/Locale/fa.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/fi.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/fi_phone.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/fil.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/fo.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/fr_ca.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/gu.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ha.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/haw.pl | 51 ++++------ cpan/Unicode-Collate/Collate/Locale/he.pl | 7 ++ cpan/Unicode-Collate/Collate/Locale/hi.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/hr.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/hu.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/hy.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ig.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/is.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ja.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/kk.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/kl.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/kn.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ko.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/kok.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ln.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/lt.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/lv.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/mk.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ml.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/mr.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/mt.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/nb.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/nn.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/nso.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/om.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/or.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/pa.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/pl.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ro.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sa.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/se.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/si.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/si_dict.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sk.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sl.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sq.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sr.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sv.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/sv_refo.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ta.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/te.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/th.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/tn.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/to.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/tr.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ug_cyrl.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/uk.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/ur.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/vi.pl | 2 +- .../Collate/Locale/{de_at_ph.pl => vo.pl} | 4 +- cpan/Unicode-Collate/Collate/Locale/wae.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/wo.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/yo.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/zh.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/zh_big5.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/zh_gb.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/zh_pin.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/zh_strk.pl | 2 +- cpan/Unicode-Collate/Collate/Locale/zh_zhu.pl | 2 +- cpan/Unicode-Collate/t/loc_az.t | 17 ++-- cpan/Unicode-Collate/t/loc_cs.t | 10 +- cpan/Unicode-Collate/t/loc_de.t | 33 ++++++- cpan/Unicode-Collate/t/loc_deat.t | 16 ++-- cpan/Unicode-Collate/t/loc_deph.t | 28 ++++-- cpan/Unicode-Collate/t/loc_es.t | 2 +- cpan/Unicode-Collate/t/loc_estr.t | 2 +- cpan/Unicode-Collate/t/loc_et.t | 13 ++- cpan/Unicode-Collate/t/loc_ha.t | 12 ++- cpan/Unicode-Collate/t/loc_haw.t | 22 ++++- cpan/Unicode-Collate/t/{loc_si.t => loc_he.t} | 41 +++++--- cpan/Unicode-Collate/t/loc_ig.t | 16 ++-- cpan/Unicode-Collate/t/loc_vo.t | 105 +++++++++++++++++++++ dist/Time-HiRes/Changes | 15 ++- dist/Time-HiRes/HiRes.pm | 2 +- 164 files changed, 717 insertions(+), 355 deletions(-) create mode 100644 cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t create mode 100644 cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t create mode 100644 cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t create mode 100644 cpan/Unicode-Collate/Collate/Locale/he.pl copy cpan/Unicode-Collate/Collate/Locale/{de_at_ph.pl => vo.pl} (91%) copy cpan/Unicode-Collate/t/{loc_si.t => loc_he.t} (50%) create mode 100644 cpan/Unicode-Collate/t/loc_vo.t diff --git a/MANIFEST b/MANIFEST index c8cf0559aa..83c1767ae3 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2704,6 +2704,8 @@ cpan/Test-Simple/t/Legacy/plan_shouldnt_import.t cpan/Test-Simple/t/Legacy/plan_skip_all.t cpan/Test-Simple/t/Legacy/Regression/637.t cpan/Test-Simple/t/Legacy/Regression/683_thread_todo.t +cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t +cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t cpan/Test-Simple/t/Legacy/require_ok.t cpan/Test-Simple/t/Legacy/run_test.t cpan/Test-Simple/t/Legacy/simple.t @@ -2748,6 +2750,7 @@ cpan/Test-Simple/t/Legacy/useing.t cpan/Test-Simple/t/Legacy/utf8.t cpan/Test-Simple/t/Legacy/versions.t cpan/Test-Simple/t/Legacy_And_Test2/builder_loaded_late.t +cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t cpan/Test-Simple/t/lib/Dev/Null.pm cpan/Test-Simple/t/lib/Dummy.pm cpan/Test-Simple/t/lib/MyOverload.pm @@ -2923,6 +2926,7 @@ cpan/Unicode-Collate/Collate/Locale/fr_ca.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/gu.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/ha.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/haw.pl Unicode::Collate +cpan/Unicode-Collate/Collate/Locale/he.pl cpan/Unicode-Collate/Collate/Locale/hi.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/hr.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/hu.pl Unicode::Collate @@ -2970,6 +2974,7 @@ cpan/Unicode-Collate/Collate/Locale/ug_cyrl.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/uk.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/ur.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/vi.pl Unicode::Collate +cpan/Unicode-Collate/Collate/Locale/vo.pl cpan/Unicode-Collate/Collate/Locale/wae.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/wo.pl Unicode::Collate cpan/Unicode-Collate/Collate/Locale/yo.pl Unicode::Collate @@ -3036,6 +3041,7 @@ cpan/Unicode-Collate/t/loc_frca.t Unicode::Collate cpan/Unicode-Collate/t/loc_gu.t Unicode::Collate cpan/Unicode-Collate/t/loc_ha.t Unicode::Collate cpan/Unicode-Collate/t/loc_haw.t Unicode::Collate +cpan/Unicode-Collate/t/loc_he.t cpan/Unicode-Collate/t/loc_hi.t Unicode::Collate cpan/Unicode-Collate/t/loc_hr.t Unicode::Collate cpan/Unicode-Collate/t/loc_hu.t Unicode::Collate @@ -3090,6 +3096,7 @@ cpan/Unicode-Collate/t/loc_ugcy.t Unicode::Collate cpan/Unicode-Collate/t/loc_uk.t Unicode::Collate cpan/Unicode-Collate/t/loc_ur.t Unicode::Collate cpan/Unicode-Collate/t/loc_vi.t Unicode::Collate +cpan/Unicode-Collate/t/loc_vo.t cpan/Unicode-Collate/t/loc_wae.t Unicode::Collate cpan/Unicode-Collate/t/loc_wo.t Unicode::Collate cpan/Unicode-Collate/t/loc_yo.t Unicode::Collate diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index f0d4f77d31..20a6b15c24 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1175,7 +1175,7 @@ use File::Glob qw(:case); }, 'Test::Simple' => { - 'DISTRIBUTION' => 'EXODIST/Test-Simple-1.302062.tar.gz', + 'DISTRIBUTION' => 'EXODIST/Test-Simple-1.302067.tar.gz', 'FILES' => q[cpan/Test-Simple], 'EXCLUDED' => [ qr{^examples/}, @@ -1288,12 +1288,12 @@ use File::Glob qw(:case); }, 'Time::HiRes' => { - 'DISTRIBUTION' => 'JHI/Time-HiRes-1.9740.tar.gz', + 'DISTRIBUTION' => 'JHI/Time-HiRes-1.9741.tar.gz', 'FILES' => q[dist/Time-HiRes], }, 'Time::Local' => { - 'DISTRIBUTION' => 'DROLSKY/Time-Local-1.24.tar.gz', + 'DISTRIBUTION' => 'DROLSKY/Time-Local-1.25.tar.gz', 'FILES' => q[cpan/Time-Local], 'EXCLUDED' => [ qr{^xt/}, @@ -1312,7 +1312,7 @@ use File::Glob qw(:case); }, 'Unicode::Collate' => { - 'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-1.18.tar.gz', + 'DISTRIBUTION' => 'SADAHIRO/Unicode-Collate-1.19.tar.gz', 'FILES' => q[cpan/Unicode-Collate], 'EXCLUDED' => [ qr{N$}, diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm index a10c19fdb7..b838f1db27 100644 --- a/cpan/Test-Simple/lib/Test/Builder.pm +++ b/cpan/Test-Simple/lib/Test/Builder.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { if( $] < 5.008 ) { @@ -238,6 +238,7 @@ sub finalize { my $plan = $chub->plan || 0; my $count = $chub->count; my $failed = $chub->failed; + my $passed = $chub->is_passing; my $num_extra = $plan =~ m/\D/ ? 0 : $count - $plan; if ($count && $num_extra != 0) { @@ -257,6 +258,12 @@ Looks like you failed $failed test$s of $count$qualifier. FAIL } + if (!$passed && !$failed && $count && !$num_extra) { + $st_ctx->diag(<<"FAIL"); +All assertions inside the subtest passed, but errors were encountered. +FAIL + } + $st_ctx->release; unless ($chub->bailed_out) { @@ -919,7 +926,20 @@ END $self->_is_diag( $got, $type, $expect ); } elsif( $type =~ /^(ne|!=)$/ ) { - $self->_isnt_diag( $got, $type ); + no warnings; + my $eq = ($got eq $expect || $got == $expect) + && ( + (defined($got) xor defined($expect)) + || (length($got) != length($expect)) + ); + use warnings; + + if ($eq) { + $self->_cmp_diag( $got, $type, $expect ); + } + else { + $self->_isnt_diag( $got, $type ); + } } else { $self->_cmp_diag( $got, $type, $expect ); @@ -1550,6 +1570,7 @@ sub _ending { my $plan = $hub->plan; my $count = $hub->count; my $failed = $hub->failed; + my $passed = $hub->is_passing; return unless $plan || $count || $failed; # Ran tests but never declared a plan or hit done_testing @@ -1622,6 +1643,12 @@ Looks like you failed $failed test$s of $count$qualifier. FAIL } + if (!$passed && !$failed && $count && !$num_extra) { + $ctx->diag(<<"FAIL"); +All assertions passed, but errors were encountered. +FAIL + } + my $exit_code = 0; if ($failed) { $exit_code = $failed <= 254 ? $failed : 254; @@ -1629,6 +1656,9 @@ FAIL elsif ($num_extra != 0) { $exit_code = 255; } + elsif (!$passed) { + $exit_code = 255; + } $$new ||= $exit_code; return; diff --git a/cpan/Test-Simple/lib/Test/Builder/Formatter.pm b/cpan/Test-Simple/lib/Test/Builder/Formatter.pm index e4051a53a0..2221f0f736 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Formatter.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Formatter.pm @@ -2,7 +2,7 @@ package Test::Builder::Formatter; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Formatter::TAP; our @ISA = qw(Test2::Formatter::TAP) } diff --git a/cpan/Test-Simple/lib/Test/Builder/Module.pm b/cpan/Test-Simple/lib/Test/Builder/Module.pm index 0bf0b08f3c..0a01161cdf 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Module.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Module.pm @@ -7,7 +7,7 @@ use Test::Builder; require Exporter; our @ISA = qw(Exporter); -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; =head1 NAME diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester.pm b/cpan/Test-Simple/lib/Test/Builder/Tester.pm index 680adf2b95..43c128024d 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester; use strict; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test::Builder; use Symbol; diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm index c67378bba4..9d58c05c73 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester::Color; use strict; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; require Test::Builder::Tester; diff --git a/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm b/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm index 2ae26262d8..1ebf65fa26 100644 --- a/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm +++ b/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm @@ -2,7 +2,7 @@ package Test::Builder::TodoDiag; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event::Diag; our @ISA = qw(Test2::Event::Diag) } diff --git a/cpan/Test-Simple/lib/Test/More.pm b/cpan/Test-Simple/lib/Test/More.pm index 0a0bfbe498..c544ff2aff 100644 --- a/cpan/Test-Simple/lib/Test/More.pm +++ b/cpan/Test-Simple/lib/Test/More.pm @@ -17,7 +17,7 @@ sub _carp { return warn @_, " at $file line $line\n"; } -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test::Builder::Module; our @ISA = qw(Test::Builder::Module); @@ -976,7 +976,10 @@ sub use_ok ($;@) { @imports = () unless @imports; my $tb = Test::More->builder; - my( $pack, $filename, $line ) = caller; + my %caller; + @caller{qw/pack file line sub args want eval req strict warn/} = caller(0); + + my ($pack, $filename, $line, $warn) = @caller{qw/pack file line warn/}; $filename =~ y/\n\r/_/; # so it doesn't run off the "#line $line $f" line my $code; @@ -985,7 +988,7 @@ sub use_ok ($;@) { # for it to work with non-Exporter based modules. $code = <<USE; package $pack; - +BEGIN { \${^WARNING_BITS} = \$args[-1] if defined \$args[-1] } #line $line $filename use $module $imports[0]; 1; @@ -994,14 +997,14 @@ USE else { $code = <<USE; package $pack; - +BEGIN { \${^WARNING_BITS} = \$args[-1] if defined \$args[-1] } #line $line $filename use $module \@{\$args[0]}; 1; USE } - my( $eval_result, $eval_error ) = _eval( $code, \@imports ); + my ($eval_result, $eval_error) = _eval($code, \@imports, $warn); my $ok = $tb->ok( $eval_result, "use $module;" ); unless($ok) { diff --git a/cpan/Test-Simple/lib/Test/Simple.pm b/cpan/Test-Simple/lib/Test/Simple.pm index 3910d3c7e5..82bfe9b3be 100644 --- a/cpan/Test-Simple/lib/Test/Simple.pm +++ b/cpan/Test-Simple/lib/Test/Simple.pm @@ -4,7 +4,7 @@ use 5.006; use strict; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test::Builder::Module; our @ISA = qw(Test::Builder::Module); diff --git a/cpan/Test-Simple/lib/Test/Tester.pm b/cpan/Test-Simple/lib/Test/Tester.pm index 18f377cb5d..4e2d50ebce 100644 --- a/cpan/Test-Simple/lib/Test/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Tester.pm @@ -18,7 +18,7 @@ require Exporter; use vars qw( @ISA @EXPORT ); -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; @EXPORT = qw( run_tests check_tests check_test cmp_results show_space ); @ISA = qw( Exporter ); diff --git a/cpan/Test-Simple/lib/Test/Tester/Capture.pm b/cpan/Test-Simple/lib/Test/Tester/Capture.pm index d02230f9d0..c1a4196de2 100644 --- a/cpan/Test-Simple/lib/Test/Tester/Capture.pm +++ b/cpan/Test-Simple/lib/Test/Tester/Capture.pm @@ -2,7 +2,7 @@ use strict; package Test::Tester::Capture; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test::Builder; diff --git a/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm b/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm index ae03fcfc66..2c9fb52fec 100644 --- a/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm +++ b/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm @@ -3,7 +3,7 @@ use strict; package Test::Tester::CaptureRunner; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test::Tester::Capture; diff --git a/cpan/Test-Simple/lib/Test/Tester/Delegate.pm b/cpan/Test-Simple/lib/Test/Tester/Delegate.pm index e043092f39..0ffae8b4bb 100644 --- a/cpan/Test-Simple/lib/Test/Tester/Delegate.pm +++ b/cpan/Test-Simple/lib/Test/Tester/Delegate.pm @@ -3,8 +3,9 @@ use warnings; package Test::Tester::Delegate; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; +use Scalar::Util(); use vars '$AUTOLOAD'; @@ -32,4 +33,13 @@ sub AUTOLOAD goto &$ref; } +sub can { + my $this = shift; + my ($sub) = @_; + + return $this->{Object}->can($sub) if Scalar::Util::blessed($this); + + return $this->SUPER::can(@_); +} + 1; diff --git a/cpan/Test-Simple/lib/Test/use/ok.pm b/cpan/Test-Simple/lib/Test/use/ok.pm index a56f2d18e2..56379db933 100644 --- a/cpan/Test-Simple/lib/Test/use/ok.pm +++ b/cpan/Test-Simple/lib/Test/use/ok.pm @@ -1,7 +1,7 @@ package Test::use::ok; use 5.005; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; __END__ diff --git a/cpan/Test-Simple/lib/Test2.pm b/cpan/Test-Simple/lib/Test2.pm index 7f365e18c0..a4153497ae 100644 --- a/cpan/Test-Simple/lib/Test2.pm +++ b/cpan/Test-Simple/lib/Test2.pm @@ -2,7 +2,7 @@ package Test2; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; 1; @@ -174,11 +174,11 @@ C<intercept()> and C<run_subtest()> are implemented. =head1 CONTACTING US -Many Test2 developers and users lurk on L<irc://irc.perl.org/#perl>. We also -have a slack team that can be joined by anyone with an C<@cpan.org> email -address L<https://perl-test2.slack.com/> If you do not have an C<@cpan.org> -email you can ask for a slack invite by emailing Chad Granum -E<lt>[email protected]<gt>. +Many Test2 developers and users lurk on L<irc://irc.perl.org/#perl-qa> and +L<irc://irc.perl.org/#toolchain>. We also have a slack team that can be joined +by anyone with an C<@cpan.org> email address L<https://perl-test2.slack.com/> +If you do not have an C<@cpan.org> email you can ask for a slack invite by +emailing Chad Granum E<lt>[email protected]<gt>. =head1 SOURCE diff --git a/cpan/Test-Simple/lib/Test2/API.pm b/cpan/Test-Simple/lib/Test2/API.pm index 98bcb1f9c2..288268f870 100644 --- a/cpan/Test-Simple/lib/Test2/API.pm +++ b/cpan/Test-Simple/lib/Test2/API.pm @@ -2,7 +2,12 @@ package Test2::API; use strict; use warnings; -our $VERSION = '1.302062'; +BEGIN { + $ENV{TEST_ACTIVE} ||= 1; + $ENV{TEST2_ACTIVE} = 1; +} + +our $VERSION = '1.302067'; my $INST; diff --git a/cpan/Test-Simple/lib/Test2/API/Breakage.pm b/cpan/Test-Simple/lib/Test2/API/Breakage.pm index 8667d853f9..07d8e18aa4 100644 --- a/cpan/Test-Simple/lib/Test2/API/Breakage.pm +++ b/cpan/Test-Simple/lib/Test2/API/Breakage.pm @@ -2,7 +2,7 @@ package Test2::API::Breakage; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::Util qw/pkg_to_file/; diff --git a/cpan/Test-Simple/lib/Test2/API/Context.pm b/cpan/Test-Simple/lib/Test2/API/Context.pm index 27da02a2a0..8ac3c02654 100644 --- a/cpan/Test-Simple/lib/Test2/API/Context.pm +++ b/cpan/Test-Simple/lib/Test2/API/Context.pm @@ -2,11 +2,11 @@ package Test2::API::Context; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Carp qw/confess croak longmess/; -use Scalar::Util qw/weaken/; +use Scalar::Util qw/weaken blessed/; use Test2::Util qw/get_tid try pkg_to_file get_tid/; use Test2::Util::Trace(); @@ -25,7 +25,7 @@ my %LOADED = ( use Test2::Util::ExternalMeta qw/meta get_meta set_meta delete_meta/; use Test2::Util::HashBase qw{ stack hub trace _on_release _depth _is_canon _is_spawn _aborted - errno eval_error child_error + errno eval_error child_error thrown }; # Private, not package vars @@ -114,6 +114,8 @@ Cleaning up the CONTEXT stack... sub release { my ($self) = @_; + ($!, $@, $?) = @$self{+ERRNO, +EVAL_ERROR, +CHILD_ERROR} and return if $self->{+THROWN}; + ($!, $@, $?) = @$self{+ERRNO, +EVAL_ERROR, +CHILD_ERROR} and return $self->{+_IS_SPAWN} = undef if $self->{+_IS_SPAWN}; @@ -189,6 +191,7 @@ sub done_testing { sub throw { my ($self, $msg) = @_; + $self->{+THROWN} = 1; ${$self->{+_ABORTED}}++ if $self->{+_ABORTED}; $self->release if $self->{+_IS_CANON} || $self->{+_IS_SPAWN}; $self->trace->throw($msg); @@ -248,7 +251,7 @@ sub ok { if ($on_fail && @$on_fail) { for my $of (@$on_fail) { - if (ref($of)) { + if (ref($of) eq 'CODE' || (blessed($of) && $of->can('render'))) { $self->info($of, diagnostics => 1); } else { diff --git a/cpan/Test-Simple/lib/Test2/API/Instance.pm b/cpan/Test-Simple/lib/Test2/API/Instance.pm index 567d54c8f5..f220d2972b 100644 --- a/cpan/Test-Simple/lib/Test2/API/Instance.pm +++ b/cpan/Test-Simple/lib/Test2/API/Instance.pm @@ -2,7 +2,7 @@ package Test2::API::Instance; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; our @CARP_NOT = qw/Test2::API Test2::API::Instance Test2::IPC::Driver Test2::Formatter/; @@ -304,6 +304,13 @@ sub ipc_enable_shm { $self->{+_TID} = get_tid() unless defined $self->{+_TID}; my ($ok, $err) = try { + # SysV IPC can be available but not enabled. + # + # In some systems (*BSD) accessing the SysV IPC APIs without + # them being enabled can cause a SIGSYS. We suppress the SIGSYS + # and then get ENOSYS from the calls. + local $SIG{SYS} = 'IGNORE'; + require IPC::SysV; my $ipc_key = IPC::SysV::IPC_PRIVATE(); @@ -488,6 +495,7 @@ This is not a supported configuration, you will have problems. $root->finalize($trace) unless $root->ended; $_->($ctx, $exit, \$new_exit) for @{$self->{+EXIT_CALLBACKS}}; $new_exit ||= $root->failed; + $new_exit ||= 255 unless $root->is_passing; } } diff --git a/cpan/Test-Simple/lib/Test2/API/Stack.pm b/cpan/Test-Simple/lib/Test2/API/Stack.pm index 438f6c02aa..9adb37b933 100644 --- a/cpan/Test-Simple/lib/Test2/API/Stack.pm +++ b/cpan/Test-Simple/lib/Test2/API/Stack.pm @@ -2,7 +2,7 @@ package Test2::API::Stack; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::Hub(); diff --git a/cpan/Test-Simple/lib/Test2/Event.pm b/cpan/Test-Simple/lib/Test2/Event.pm index dedf7c245f..8eb0331426 100644 --- a/cpan/Test-Simple/lib/Test2/Event.pm +++ b/cpan/Test-Simple/lib/Test2/Event.pm @@ -2,7 +2,7 @@ package Test2::Event; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::Util::HashBase qw/trace nested in_subtest subtest_id/; diff --git a/cpan/Test-Simple/lib/Test2/Event/Bail.pm b/cpan/Test-Simple/lib/Test2/Event/Bail.pm index f1fdb2b92e..858e2907bc 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Bail.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Bail.pm @@ -2,7 +2,7 @@ package Test2::Event::Bail; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Diag.pm b/cpan/Test-Simple/lib/Test2/Event/Diag.pm index af2e0b5bba..ddf644ecbd 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Diag.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Diag.pm @@ -2,7 +2,7 @@ package Test2::Event::Diag; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Exception.pm b/cpan/Test-Simple/lib/Test2/Event/Exception.pm index 50504947d4..3af37689bc 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Exception.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Exception.pm @@ -2,7 +2,7 @@ package Test2::Event::Exception; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Generic.pm b/cpan/Test-Simple/lib/Test2/Event/Generic.pm index 0ae200e4f1..f61db2b471 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Generic.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Generic.pm @@ -5,7 +5,7 @@ use warnings; use Carp qw/croak/; use Scalar::Util qw/reftype/; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } use Test2::Util::HashBase; diff --git a/cpan/Test-Simple/lib/Test2/Event/Info.pm b/cpan/Test-Simple/lib/Test2/Event/Info.pm index f78fa35876..678a1ce0a1 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Info.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Info.pm @@ -4,7 +4,7 @@ use warnings; use Scalar::Util qw/blessed/; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } use Test2::Util::HashBase qw/diagnostics renderer/; diff --git a/cpan/Test-Simple/lib/Test2/Event/Note.pm b/cpan/Test-Simple/lib/Test2/Event/Note.pm index bff3c7b0a6..2f34fb90c4 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Note.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Note.pm @@ -2,7 +2,7 @@ package Test2::Event::Note; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Ok.pm b/cpan/Test-Simple/lib/Test2/Event/Ok.pm index b372fd192a..a70fb79e7c 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Ok.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Ok.pm @@ -2,7 +2,7 @@ package Test2::Event::Ok; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Plan.pm b/cpan/Test-Simple/lib/Test2/Event/Plan.pm index 2ce3315a2d..dc6c71de0b 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Plan.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Plan.pm @@ -2,7 +2,7 @@ package Test2::Event::Plan; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Skip.pm b/cpan/Test-Simple/lib/Test2/Event/Skip.pm index 7d5c3d9dd6..2b4b4eef4d 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Skip.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Skip.pm @@ -2,7 +2,7 @@ package Test2::Event::Skip; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Subtest.pm b/cpan/Test-Simple/lib/Test2/Event/Subtest.pm index 4792280e06..1b96c22195 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Subtest.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Subtest.pm @@ -2,7 +2,7 @@ package Test2::Event::Subtest; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Waiting.pm b/cpan/Test-Simple/lib/Test2/Event/Waiting.pm index 304af72f59..5fd0b357a7 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Waiting.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Waiting.pm @@ -2,7 +2,7 @@ package Test2::Event::Waiting; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Formatter.pm b/cpan/Test-Simple/lib/Test2/Formatter.pm index d00559471c..daa45d1e68 100644 --- a/cpan/Test-Simple/lib/Test2/Formatter.pm +++ b/cpan/Test-Simple/lib/Test2/Formatter.pm @@ -2,7 +2,7 @@ package Test2::Formatter; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; my %ADDED; diff --git a/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm b/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm index 3c2cce8d3c..3074e1766f 100644 --- a/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm +++ b/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm @@ -3,7 +3,7 @@ use strict; use warnings; require PerlIO; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::Util::HashBase qw{ diff --git a/cpan/Test-Simple/lib/Test2/Hub.pm b/cpan/Test-Simple/lib/Test2/Hub.pm index d15912dc4b..5acee794f5 100644 --- a/cpan/Test-Simple/lib/Test2/Hub.pm +++ b/cpan/Test-Simple/lib/Test2/Hub.pm @@ -2,11 +2,11 @@ package Test2::Hub; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Carp qw/carp croak confess/; -use Test2::Util qw/get_tid/; +use Test2::Util qw/get_tid ipc_separator/; use Scalar::Util qw/weaken/; @@ -39,7 +39,7 @@ sub init { $self->{+PID} = $$; $self->{+TID} = get_tid(); - $self->{+HID} = join '-', $self->{+PID}, $self->{+TID}, $ID_POSTFIX++; + $self->{+HID} = join ipc_separator, $self->{+PID}, $self->{+TID}, $ID_POSTFIX++; $self->{+COUNT} = 0; $self->{+FAILED} = 0; @@ -285,9 +285,11 @@ sub process { my $is_ok = $type eq 'Test2::Event::Ok'; my $no_fail = $type eq 'Test2::Event::Diag' || $type eq 'Test2::Event::Note'; my $causes_fail = $is_ok ? !$e->{effective_pass} : $no_fail ? 0 : $e->causes_fail; + my $counted = $is_ok || (!$no_fail && $e->increments_count); - $self->{+COUNT}++ if $is_ok || (!$no_fail && $e->increments_count); - $self->{+FAILED}++ and $self->{+_PASSING} = 0 if $causes_fail; + $self->{+COUNT}++ if $counted; + $self->{+FAILED}++ if $causes_fail && $counted; + $self->{+_PASSING} = 0 if $causes_fail; my $callback = $e->callback($self) unless $is_ok || $no_fail; @@ -390,7 +392,7 @@ sub is_passing { ($self->{+_PASSING}) = @_ if @_; # If we already failed just return 0. - my $pass = $self->{+_PASSING} || return 0; + my $pass = $self->{+_PASSING} or return 0; return $self->{+_PASSING} = 0 if $self->{+FAILED}; my $count = $self->{+COUNT}; diff --git a/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm b/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm index 5d211d20a8..97a257e7f4 100644 --- a/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm +++ b/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm @@ -2,7 +2,7 @@ package Test2::Hub::Interceptor; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::Hub::Interceptor::Terminator(); diff --git a/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm b/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm index bbfa98370b..c527e3a23e 100644 --- a/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm +++ b/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm @@ -2,7 +2,7 @@ package Test2::Hub::Interceptor::Terminator; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; 1; diff --git a/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm b/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm index 2da696896f..668ea6196f 100644 --- a/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm +++ b/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm @@ -2,7 +2,7 @@ package Test2::Hub::Subtest; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::Hub; our @ISA = qw(Test2::Hub) } diff --git a/cpan/Test-Simple/lib/Test2/IPC.pm b/cpan/Test-Simple/lib/Test2/IPC.pm index 5c034e3ad4..67b8d4e8a3 100644 --- a/cpan/Test-Simple/lib/Test2/IPC.pm +++ b/cpan/Test-Simple/lib/Test2/IPC.pm @@ -2,7 +2,7 @@ package Test2::IPC; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::API::Instance; @@ -14,6 +14,7 @@ use Test2::API qw{ test2_pid test2_stack test2_tid + context }; use Carp qw/confess/; diff --git a/cpan/Test-Simple/lib/Test2/IPC/Driver.pm b/cpan/Test-Simple/lib/Test2/IPC/Driver.pm index 32d1333dca..ba0800cacf 100644 --- a/cpan/Test-Simple/lib/Test2/IPC/Driver.pm +++ b/cpan/Test-Simple/lib/Test2/IPC/Driver.pm @@ -2,7 +2,7 @@ package Test2::IPC::Driver; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Carp qw/confess longmess/; diff --git a/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm b/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm index 696bda9242..5e0418fdf5 100644 --- a/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm +++ b/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm @@ -2,7 +2,7 @@ package Test2::IPC::Driver::Files; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; BEGIN { require Test2::IPC::Driver; our @ISA = qw(Test2::IPC::Driver) } @@ -15,7 +15,7 @@ use Storable(); use File::Spec(); use POSIX(); -use Test2::Util qw/try get_tid pkg_to_file IS_WIN32/; +use Test2::Util qw/try get_tid pkg_to_file IS_WIN32 ipc_separator/; use Test2::API qw/test2_ipc_set_pending/; BEGIN { @@ -72,7 +72,7 @@ sub init { my $self = shift; my $tmpdir = File::Temp::tempdir( - $ENV{T2_TEMPDIR_TEMPLATE} || "test2-$$-XXXXXX", + $ENV{T2_TEMPDIR_TEMPLATE} || "test2" . ipc_separator . $$ . ipc_separator . "XXXXXX", CLEANUP => 0, TMPDIR => 1, ); @@ -98,7 +98,7 @@ sub hub_file { my $self = shift; my ($hid) = @_; my $tdir = $self->{+TEMPDIR}; - return File::Spec->catfile($tdir, "HUB-$hid"); + return File::Spec->catfile($tdir, "HUB" . ipc_separator . $hid); } sub event_file { @@ -112,7 +112,7 @@ sub event_file { unless $type->isa('Test2::Event'); my @type = split '::', $type; - my $name = join('-', $hid, $$, get_tid(), $self->{+EVENT_ID}++, @type); + my $name = join(ipc_separator, $hid, $$, get_tid(), $self->{+EVENT_ID}++, @type); return File::Spec->catfile($tempdir, $name); } @@ -296,8 +296,8 @@ sub parse_event_filename { my $complete = substr($file, -9, 9) eq '.complete' || 0 and substr($file, -9, 9, ""); my $ready = substr($file, -6, 6) eq '.ready' || 0 and substr($file, -6, 6, ""); - my @parts = split '-', $file; - my ($global, $hid) = $parts[0] eq 'GLOBAL' ? (1, shift @parts) : (0, join '-' => splice(@parts, 0, 3)); + my @parts = split ipc_separator, $file; + my ($global, $hid) = $parts[0] eq 'GLOBAL' ? (1, shift @parts) : (0, join ipc_separator, splice(@parts, 0, 3)); my ($pid, $tid, $eid) = splice(@parts, 0, 3); my $type = join '::' => @parts; @@ -398,7 +398,8 @@ sub DESTROY { next if $file =~ m/\.complete$/; my $full = File::Spec->catfile($tempdir, $file); - if ($file =~ m/^(GLOBAL|HUB-)/) { + my $sep = ipc_separator; + if ($file =~ m/^(GLOBAL|HUB$sep)/) { $full =~ m/^(.*)$/; $full = $1; # Untaint it next if $ENV{T2_KEEP_TEMPDIR}; diff --git a/cpan/Test-Simple/lib/Test2/Util.pm b/cpan/Test-Simple/lib/Test2/Util.pm index 070c574469..0a5347a52a 100644 --- a/cpan/Test-Simple/lib/Test2/Util.pm +++ b/cpan/Test-Simple/lib/Test2/Util.pm @@ -2,7 +2,7 @@ package Test2::Util; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Config qw/%Config/; @@ -18,6 +18,8 @@ our @EXPORT_OK = qw{ CAN_FORK IS_WIN32 + + ipc_separator }; BEGIN { require Exporter; our @ISA = qw(Exporter) } @@ -139,6 +141,8 @@ sub pkg_to_file { return $file; } +sub ipc_separator() { "~" } + 1; __END__ diff --git a/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm b/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm index 0d73fbeecd..38c81b97e9 100644 --- a/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm +++ b/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm @@ -2,7 +2,7 @@ package Test2::Util::ExternalMeta; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Carp qw/croak/; diff --git a/cpan/Test-Simple/lib/Test2/Util/HashBase.pm b/cpan/Test-Simple/lib/Test2/Util/HashBase.pm index 0a40191ad0..02516da798 100644 --- a/cpan/Test-Simple/lib/Test2/Util/HashBase.pm +++ b/cpan/Test-Simple/lib/Test2/Util/HashBase.pm @@ -2,7 +2,7 @@ package Test2::Util::HashBase; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; require Carp; diff --git a/cpan/Test-Simple/lib/Test2/Util/Trace.pm b/cpan/Test-Simple/lib/Test2/Util/Trace.pm index 34be24f6d6..7884f0c9b6 100644 --- a/cpan/Test-Simple/lib/Test2/Util/Trace.pm +++ b/cpan/Test-Simple/lib/Test2/Util/Trace.pm @@ -2,7 +2,7 @@ package Test2::Util::Trace; use strict; use warnings; -our $VERSION = '1.302062'; +our $VERSION = '1.302067'; use Test2::Util qw/get_tid/; diff --git a/cpan/Test-Simple/lib/ok.pm b/cpan/Test-Simple/lib/ok.pm index 4c5f9d139a..71b57c3f49 100644 --- a/cpan/Test-Simple/lib/ok.pm +++ b/cpan/Test-Simple/lib/ok.pm @@ -1,5 +1,5 @@ package ok; -$ok::VERSION = '1.302062'; +our $VERSION = '1.302067'; use strict; use Test::More (); diff --git a/cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t b/cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t new file mode 100644 index 0000000000..05cfcba9a4 --- /dev/null +++ b/cpan/Test-Simple/t/Legacy/Regression/6_cmp_ok.t @@ -0,0 +1,17 @@ +use Test::More; + +use Test2::API qw/intercept/; + +my $events = intercept { + local $SIG{__WARN__} = sub { 1 }; + my $foo = undef; + cmp_ok($foo, "ne", ""); +}; + +is($events->[-1]->message, <<EOT, "Got useful diag"); + undef + ne + '' +EOT + +done_testing; diff --git a/cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t b/cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t new file mode 100644 index 0000000000..f9a64ee256 --- /dev/null +++ b/cpan/Test-Simple/t/Legacy/Regression/736_use_ok.t @@ -0,0 +1,31 @@ +use warnings; +use strict; +use Test::More; + +BEGIN { + $INC{'MyWarner.pm'} = 1; + package MyWarner; + + sub import { + warnings::warnif('deprecated', "Deprected! run for your lives!"); + } +} + +sub capture(&) { + my $warn; + local $SIG{__WARN__} = sub { $warn = shift }; + $_[0]->(); + return $warn || ""; +} + +my $file = __FILE__; +my $line = __LINE__ + 2; +like( + capture { use_ok 'MyWarner' }, + qr/^Deprected! run for your lives! at \Q$file\E line $line/, + "Got the warning" +); + +ok(!capture { no warnings 'deprecated'; use_ok 'MyWarner' }, "No warning"); + +done_testing; diff --git a/cpan/Test-Simple/t/Legacy/auto.t b/cpan/Test-Simple/t/Legacy/auto.t index 61785d6156..5a5de4fb5b 100644 --- a/cpan/Test-Simple/t/Legacy/auto.t +++ b/cpan/Test-Simple/t/Legacy/auto.t @@ -3,7 +3,7 @@ use warnings; use lib 't/lib'; -use Test::Tester tests => 5; +use Test::Tester tests => 6; use SmallTest; @@ -28,3 +28,9 @@ use MyTest; } is_eq(ref(SmallTest::getTest()), "Test::Tester::Delegate"); + +is_eq( + SmallTest::getTest()->can('ok'), + Test::Builder->can('ok'), + "Delegate->can() returns the sub from the inner object", +); diff --git a/cpan/Test-Simple/t/Legacy/fail-more.t b/cpan/Test-Simple/t/Legacy/fail-more.t index 5c35d49bd3..5cb373edef 100644 --- a/cpan/Test-Simple/t/Legacy/fail-more.t +++ b/cpan/Test-Simple/t/Legacy/fail-more.t @@ -440,16 +440,13 @@ ERR not ok - undef ne empty string OUT - TODO: { - local $::TODO = 'cmp_ok() gives the wrong "expected" for undef'; - - $TB->is_eq( $err->read, <<ERR ); + $TB->is_eq( $err->read, <<ERR ); # Failed test 'undef ne empty string' # at $0 line 437. -# got: undef -# expected: '' +# undef +# ne +# '' ERR - } My::Test::like( $warnings, diff --git a/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t b/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t new file mode 100644 index 0000000000..a487ab561d --- /dev/null +++ b/cpan/Test-Simple/t/Legacy_And_Test2/hidden_warnings.t @@ -0,0 +1,20 @@ +use strict; +use warnings; +BEGIN { require "t/tools.pl" }; +use Test2::API qw( context_do ); + +$SIG{__WARN__} = sub { + context_do { shift->throw("oops\n"); } + $_[0]; +}; + +my $array_var = []; +eval { warn "trigger warning" }; +my $err = $@; +like( + $err, + qr/oops/, + "Got expected error" +); + +done_testing(); diff --git a/cpan/Test-Simple/t/Test2/behavior/Formatter.t b/cpan/Test-Simple/t/Test2/behavior/Formatter.t index 01eebc614e..24bd6c24b5 100644 --- a/cpan/Test-Simple/t/Test2/behavior/Formatter.t +++ b/cpan/Test-Simple/t/Test2/behavior/Formatter.t @@ -9,7 +9,7 @@ use Test2::Event::Bail; { package Formatter::Subclass; - use parent 'Test2::Formatter'; + use base 'Test2::Formatter'; use Test2::Util::HashBase qw{f t}; sub init { diff --git a/cpan/Test-Simple/t/Test2/modules/Event/Info.t b/cpan/Test-Simple/t/Test2/modules/Event/Info.t index 8bf9d7812d..64dff5c5ff 100644 --- a/cpan/Test-Simple/t/Test2/modules/Event/Info.t +++ b/cpan/Test-Simple/t/Test2/modules/Event/Info.t @@ -5,6 +5,7 @@ BEGIN { require "t/tools.pl" }; use Test2::Event::Info; use Test2::Util::Trace; +use Test2::API qw/intercept/; my @got; @@ -42,4 +43,9 @@ like( "Got expected error" ); +# For #727 +$info = intercept { ok(0, 'xxx', sub { 'xxx-yyy' }); }->[-1]; +ok($info->isa('Test2::Event::Info'), "Got an Info event"); +is($info->render, 'xxx-yyy', "Got rendered info"); + done_testing; diff --git a/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t b/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t index 6ede9df45a..c15f0e7077 100644 --- a/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t +++ b/cpan/Test-Simple/t/Test2/modules/IPC/Driver/Files.t @@ -1,5 +1,5 @@ BEGIN { require "t/tools.pl" }; -use Test2::Util qw/get_tid USE_THREADS try/; +use Test2::Util qw/get_tid USE_THREADS try ipc_separator/; use File::Temp qw/tempfile/; use File::Spec qw/catfile/; use List::Util qw/shuffle/; @@ -41,10 +41,10 @@ ok(-d $ipc->tempdir, "created temp dir"); is($ipc->pid, $$, "stored pid"); is($ipc->tid, get_tid(), "stored the tid"); -my $hid = '12345-1-1'; +my $hid = join ipc_separator, qw'12345 1 1'; $ipc->add_hub($hid); -my $hubfile = File::Spec->catfile($ipc->tempdir, "HUB-$hid"); +my $hubfile = File::Spec->catfile($ipc->tempdir, "HUB" . ipc_separator . $hid); ok(-f $hubfile, "wrote hub file"); if(ok(open(my $fh, '<', $hubfile), "opened hub file")) { my @lines = <$fh>; @@ -64,8 +64,9 @@ if(ok(open(my $fh, '<', $hubfile), "opened hub file")) { $ipc->send($hid, bless({ foo => 1 }, 'Foo')); $ipc->send($hid, bless({ bar => 1 }, 'Foo')); +my $sep = ipc_separator; opendir(my $dh, $ipc->tempdir) || die "Could not open tempdir: !?"; -my @files = grep { $_ !~ m/^\.+$/ && $_ !~ m/^HUB-$hid/ } readdir($dh); +my @files = grep { $_ !~ m/^\.+$/ && $_ !~ m/^HUB${sep}$hid/ } readdir($dh); closedir($dh); is(@files, 2, "2 files added to the IPC directory"); @@ -77,7 +78,7 @@ is_deeply( ); opendir($dh, $ipc->tempdir) || die "Could not open tempdir: !?"; -@files = grep { $_ !~ m/^\.+$/ && $_ !~ m/^HUB-$hid/ } readdir($dh); +@files = grep { $_ !~ m/^\.+$/ && $_ !~ m/^HUB$sep$hid/ } readdir($dh); closedir($dh); is(@files, 0, "All files collected"); @@ -172,8 +173,8 @@ ok(!-d $tmpdir, "cleaned up temp dir"); like($out->{STDERR}, qr/IPC Temp Dir: \Q$tmpdir\E/m, "Got temp dir path"); like($out->{STDERR}, qr/^# Not removing temp dir: \Q$tmpdir\E$/m, "Notice about not closing tempdir"); - like($out->{STDERR}, qr/^IPC Fatal Error: File for hub '12345-1-1' already exists/m, "Got message for duplicate hub"); - like($out->{STDERR}, qr/^IPC Fatal Error: File for hub '12345-1-1' does not exist/m, "Cannot remove hub twice"); + like($out->{STDERR}, qr/^IPC Fatal Error: File for hub '$hid' already exists/m, "Got message for duplicate hub"); + like($out->{STDERR}, qr/^IPC Fatal Error: File for hub '$hid' does not exist/m, "Cannot remove hub twice"); $out = simple_capture { my $ipc = Test2::IPC::Driver::Files->new(); @@ -186,7 +187,7 @@ ok(!-d $tmpdir, "cleaned up temp dir"); like($out->{STDERR}, qr/IPC Fatal Error:/, "Got fatal error"); like($out->{STDERR}, qr/There was an error writing an event/, "Explanation"); - like($out->{STDERR}, qr/Destination: 12345-1-1/, "Got dest"); + like($out->{STDERR}, qr/Destination: $hid/, "Got dest"); like($out->{STDERR}, qr/Origin PID:\s+$$/, "Got pid"); like($out->{STDERR}, qr/Error: Can't store GLOB items/, "Got cause"); @@ -197,7 +198,7 @@ ok(!-d $tmpdir, "cleaned up temp dir"); print STDERR $@ unless $@ =~ m/^255/; $ipc = undef; }; - like($out->{STDERR}, qr/IPC Fatal Error: hub '12345-1-1' is not available, failed to send event!/, "Cannot send to missing hub"); + like($out->{STDERR}, qr/IPC Fatal Error: hub '$hid' is not available, failed to send event!/, "Cannot send to missing hub"); $out = simple_capture { my $ipc = Test2::IPC::Driver::Files->new(); @@ -209,7 +210,7 @@ ok(!-d $tmpdir, "cleaned up temp dir"); print STDERR $@ unless $@ =~ m/^255/; }; $cleanup->(); - like($out->{STDERR}, qr/IPC Fatal Error: Not all files from hub '12345-1-1' have been collected/, "Leftover files"); + like($out->{STDERR}, qr/IPC Fatal Error: Not all files from hub '$hid' have been collected/, "Leftover files"); like($out->{STDERR}, qr/IPC Fatal Error: Leftover files in the directory \(.*\.ready\)/, "What file"); $out = simple_capture { @@ -347,7 +348,7 @@ ok(!-d $tmpdir, "cleaned up temp dir"); my $ipc = 'Test2::IPC::Driver::Files'; is_deeply( - $ipc->parse_event_filename('GLOBAL-123-456-789-Event-Type-Foo.ready.complete'), + $ipc->parse_event_filename(join ipc_separator, qw'GLOBAL 123 456 789 Event Type Foo.ready.complete'), { ready => 1, complete => 1, @@ -362,7 +363,7 @@ ok(!-d $tmpdir, "cleaned up temp dir"); ); is_deeply( - $ipc->parse_event_filename('GLOBAL-123-456-789-Event-Type-Foo.ready'), + $ipc->parse_event_filename(join ipc_separator, qw'GLOBAL 123 456 789 Event Type Foo.ready'), { ready => 1, complete => 0, @@ -377,7 +378,7 @@ ok(!-d $tmpdir, "cleaned up temp dir"); ); is_deeply( - $ipc->parse_event_filename('GLOBAL-123-456-789-Event-Type-Foo'), + $ipc->parse_event_filename(join ipc_separator, qw'GLOBAL 123 456 789 Event Type Foo'), { ready => 0, complete => 0, @@ -392,13 +393,13 @@ ok(!-d $tmpdir, "cleaned up temp dir"); ); is_deeply( - $ipc->parse_event_filename('1-1-1-123-456-789-Event-Type-Foo.ready.complete'), + $ipc->parse_event_filename(join ipc_separator, qw'1 1 1 123 456 789 Event Type Foo.ready.complete'), { ready => 1, complete => 1, global => 0, type => "Event::Type::Foo", - hid => "1-1-1", + hid => "1${sep}1${sep}1", pid => "123", tid => "456", eid => "789", @@ -407,13 +408,13 @@ ok(!-d $tmpdir, "cleaned up temp dir"); ); is_deeply( - $ipc->parse_event_filename('1-2-3-123-456-789-Event-Type-Foo.ready'), + $ipc->parse_event_filename(join ipc_separator, qw'1 2 3 123 456 789 Event Type Foo.ready'), { ready => 1, complete => 0, global => 0, type => "Event::Type::Foo", - hid => "1-2-3", + hid => "1${sep}2${sep}3", pid => "123", tid => "456", eid => "789", @@ -422,13 +423,13 @@ ok(!-d $tmpdir, "cleaned up temp dir"); ); is_deeply( - $ipc->parse_event_filename('3-2-11-123-456-789-Event'), + $ipc->parse_event_filename(join ipc_separator, qw'3 2 11 123 456 789 Event'), { ready => 0, complete => 0, global => 0, type => "Event", - hid => "3-2-11", + hid => "3${sep}2${sep}11", pid => "123", tid => "456", eid => "789", @@ -440,83 +441,83 @@ ok(!-d $tmpdir, "cleaned up temp dir"); { my $ipc = Test2::IPC::Driver::Files->new(); - my $hid = "1-1-1"; + my $hid = join ipc_separator, qw"1 1 1"; is_deeply( - $ipc->should_read_event($hid, "GLOBAL-123-456-789-Event-Type-Foo.ready.complete") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"GLOBAL 123 456 789 Event Type Foo.ready.complete") ? 1 : 0, 0, "Do not read complete global" ); is_deeply( - $ipc->should_read_event($hid, "GLOBAL-123-456-789-Event-Type-Foo.ready") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"GLOBAL 123 456 789 Event Type Foo.ready") ? 1 : 0, 1, "Should read ready global the first time" ); is_deeply( - $ipc->should_read_event($hid, "GLOBAL-123-456-789-Event-Type-Foo.ready") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"GLOBAL 123 456 789 Event Type Foo.ready") ? 1 : 0, 0, "Should not read ready global again" ); is_deeply( - $ipc->should_read_event($hid, "GLOBAL-123-456-789-Event-Type-Foo") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"GLOBAL 123 456 789 Event Type Foo") ? 1 : 0, 0, "Should not read un-ready global" ); is_deeply( - $ipc->should_read_event($hid, "$hid-123-456-789-Event-Type-Foo.ready.complete") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, $hid, qw"123 456 789 Event Type Foo.ready.complete") ? 1 : 0, 0, "Do not read complete our hid" ); is_deeply( - $ipc->should_read_event($hid, "$hid-123-456-789-Event-Type-Foo.ready") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, $hid, qw"123 456 789 Event Type Foo.ready") ? 1 : 0, 1, "Should read ready our hid" ); is_deeply( - $ipc->should_read_event($hid, "$hid-123-456-789-Event-Type-Foo.ready") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, $hid, qw"123 456 789 Event Type Foo.ready") ? 1 : 0, 1, "Should read ready our hid (again, no duplicate checking)" ); is_deeply( - $ipc->should_read_event($hid, "$hid-123-456-789-Event-Type-Foo") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, $hid, qw"123 456 789 Event Type Foo") ? 1 : 0, 0, "Should not read un-ready our hid" ); is_deeply( - $ipc->should_read_event($hid, "1-2-3-123-456-789-Event-Type-Foo.ready.complete") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"1 2 3 123 456 789 Event Type Foo.ready.complete") ? 1 : 0, 0, "Not ours - complete" ); is_deeply( - $ipc->should_read_event($hid, "1-2-3-123-456-789-Event-Type-Foo.ready") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"1 2 3 123 456 789 Event Type Foo.ready") ? 1 : 0, 0, "Not ours - ready" ); is_deeply( - $ipc->should_read_event($hid, "1-2-3-123-456-789-Event-Type-Foo") ? 1 : 0, + $ipc->should_read_event($hid, join ipc_separator, qw"1 2 3 123 456 789 Event Type Foo") ? 1 : 0, 0, "Not ours - unready" ); - my @got = $ipc->should_read_event($hid, "$hid-123-456-789-Event-Type-Foo"); + my @got = $ipc->should_read_event($hid, join ipc_separator, $hid, qw"123 456 789 Event Type Foo"); ok(!@got, "return empty list for false"); - @got = $ipc->should_read_event($hid, "$hid-123-456-789-Event-Type-Foo.ready"); + @got = $ipc->should_read_event($hid, join ipc_separator, $hid, qw"123 456 789 Event Type Foo.ready"); is(@got, 1, "got 1 item on true"); - like(delete $got[0]->{full_path}, qr{^.+\Q$hid\E-123-456-789-Event-Type-Foo\.ready$}, "Got full path"); + like(delete $got[0]->{full_path}, qr{^.+\Q$hid\E${sep}123${sep}456${sep}789${sep}Event${sep}Type${sep}Foo\.ready$}, "Got full path"); is_deeply( $got[0], - $ipc->parse_event_filename("$hid-123-456-789-Event-Type-Foo.ready"), + $ipc->parse_event_filename(join ipc_separator, $hid, qw"123 456 789 Event Type Foo.ready"), "Apart from full_path we get entire parsed filename" ); diff --git a/cpan/Time-Local/lib/Time/Local.pm b/cpan/Time-Local/lib/Time/Local.pm index 6073940589..65d7d58845 100644 --- a/cpan/Time-Local/lib/Time/Local.pm +++ b/cpan/Time-Local/lib/Time/Local.pm @@ -2,11 +2,10 @@ package Time::Local; use strict; -use Carp; -use Config; +use Carp (); use Exporter; -our $VERSION = '1.24'; +our $VERSION = '1.25'; use parent 'Exporter'; @@ -31,14 +30,20 @@ use constant SECS_PER_DAY => 86400; my $MaxDay; if ( $] < 5.012000 ) { + require Config; + ## no critic (Variables::ProhibitPackageVars) + my $MaxInt; if ( $^O eq 'MacOS' ) { # time_t is unsigned... - $MaxInt = ( 1 << ( 8 * $Config{ivsize} ) ) - 1; + $MaxInt = ( 1 << ( 8 * $Config::Config{ivsize} ) ) + - 1; ## no critic qw(ProhibitPackageVars) } else { - $MaxInt = ( ( 1 << ( 8 * $Config{ivsize} - 2 ) ) - 1 ) * 2 + 1; + $MaxInt + = ( ( 1 << ( 8 * $Config::Config{ivsize} - 2 ) ) - 1 ) * 2 + + 1; ## no critic qw(ProhibitPackageVars) } $MaxDay = int( ( $MaxInt - ( SECS_PER_DAY / 2 ) ) / SECS_PER_DAY ) - 1; @@ -83,8 +88,7 @@ sub _daygm { + int( $year / 4 ) - int( $year / 100 ) + int( $year / 400 ) - + int( ( ( $month * 306 ) + 5 ) / 10 ) ) - - $Epoc; + + int( ( ( $month * 306 ) + 5 ) / 10 ) ) - $Epoc; } ); } @@ -109,7 +113,7 @@ sub timegm { } unless ( $Options{no_range_check} ) { - croak "Month '$month' out of range 0..11" + Carp::croak("Month '$month' out of range 0..11") if $month > 11 or $month < 0; @@ -117,10 +121,14 @@ sub timegm { ++$md if $month == 1 && _is_leap_year( $year + 1900 ); - croak "Day '$mday' out of range 1..$md" if $mday > $md or $mday < 1; - croak "Hour '$hour' out of range 0..23" if $hour > 23 or $hour < 0; - croak "Minute '$min' out of range 0..59" if $min > 59 or $min < 0; - croak "Second '$sec' out of range 0..59" if $sec >= 60 or $sec < 0; + Carp::croak("Day '$mday' out of range 1..$md") + if $mday > $md or $mday < 1; + Carp::croak("Hour '$hour' out of range 0..23") + if $hour > 23 or $hour < 0; + Carp::croak("Minute '$min' out of range 0..59") + if $min > 59 or $min < 0; + Carp::croak("Second '$sec' out of range 0..59") + if $sec >= 60 or $sec < 0; } my $days = _daygm( undef, undef, undef, $mday, $month, $year ); @@ -133,7 +141,7 @@ sub timegm { $msg .= "Cannot handle date ($sec, $min, $hour, $mday, $month, $year)"; - croak $msg; + Carp::croak($msg); } return @@ -214,7 +222,7 @@ Time::Local - Efficiently compute time from local and GMT time =head1 VERSION -version 1.24 +version 1.25 =head1 SYNOPSIS @@ -370,24 +378,37 @@ The current version was written by Graham Barr. The whole scheme for interpreting two-digit years can be considered a bug. -Bugs may be submitted through L<the RT bug tracker|http://rt.cpan.org/Public/Dist/Display.html?Name=Time-Local> -(or L<[email protected]|mailto:[email protected]>). +Bugs may be submitted through L<https://github.com/houseabsolute/Time-Local/issues>. There is a mailing list available for users of this distribution, L<mailto:[email protected]>. -I am also usually active on IRC as 'drolsky' on C<irc://irc.perl.org>. +I am also usually active on IRC as 'autarch' on C<irc://irc.perl.org>. =head1 AUTHOR Dave Rolsky <[email protected]> -=head1 CONTRIBUTOR +=head1 CONTRIBUTORS + +=for stopwords Florian Ragwitz J. Nick Koston Unknown -=for stopwords Florian Ragwitz +=over 4 + +=item * Florian Ragwitz <[email protected]> +=item * + +J. Nick Koston <[email protected]> + +=item * + +Unknown <[email protected]> + +=back + =head1 COPYRIGHT AND LICENSE This software is copyright (c) 1997 - 2016 by Graham Barr & Dave Rolsky. diff --git a/cpan/Unicode-Collate/Collate.pm b/cpan/Unicode-Collate/Collate.pm index 929e340979..e485387d9f 100644 --- a/cpan/Unicode-Collate/Collate.pm +++ b/cpan/Unicode-Collate/Collate.pm @@ -17,7 +17,7 @@ use File::Spec; no warnings 'utf8'; -our $VERSION = '1.18'; +our $VERSION = '1.19'; our $PACKAGE = __PACKAGE__; ### begin XS only ### diff --git a/cpan/Unicode-Collate/Collate/CJK/Big5.pm b/cpan/Unicode-Collate/Collate/CJK/Big5.pm index 945ea5f88d..63f970a797 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Big5.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Big5.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/GB2312.pm b/cpan/Unicode-Collate/Collate/CJK/GB2312.pm index 3e64542b55..ce01413299 100644 --- a/cpan/Unicode-Collate/Collate/CJK/GB2312.pm +++ b/cpan/Unicode-Collate/Collate/CJK/GB2312.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm b/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm index 08b8163826..fe85f757f7 100644 --- a/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm +++ b/cpan/Unicode-Collate/Collate/CJK/JISX0208.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/Korean.pm b/cpan/Unicode-Collate/Collate/CJK/Korean.pm index a7aef7ad43..3ca9eaaff6 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Korean.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Korean.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %jamo2prim = ( '1100', 0x3A5E, '1101', 0x3A5F, '1102', 0x3A60, '1103', 0x3A61, diff --git a/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm b/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm index c3d400331b..751d086868 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Pinyin.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/Stroke.pm b/cpan/Unicode-Collate/Collate/CJK/Stroke.pm index 37e1b45fa2..cce32a1f85 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Stroke.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Stroke.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm b/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm index 246905b423..57fb61ee25 100644 --- a/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm +++ b/cpan/Unicode-Collate/Collate/CJK/Zhuyin.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.18'; +our $VERSION = '1.19'; my %u2p; my $wt = 0x8000; diff --git a/cpan/Unicode-Collate/Collate/Locale.pm b/cpan/Unicode-Collate/Collate/Locale.pm index 24d3ec0c1f..63122b646d 100644 --- a/cpan/Unicode-Collate/Collate/Locale.pm +++ b/cpan/Unicode-Collate/Collate/Locale.pm @@ -5,15 +5,15 @@ use warnings; use Carp; use base qw(Unicode::Collate); -our $VERSION = '1.18'; +our $VERSION = '1.19'; my $PL_EXT = '.pl'; my %LocaleFile = map { ($_, $_) } qw( af ar as az be bn ca cs cy da ee eo es et fa fi fil fo - gu ha haw hi hr hu hy ig is ja kk kl kn ko kok ln lt lv + gu ha haw he hi hr hu hy ig is ja kk kl kn ko kok ln lt lv mk ml mr mt nb nn nso om or pa pl ro sa se si sk sl sq - sr sv ta te th tn to tr uk ur vi wae wo yo zh + sr sv ta te th tn to tr uk ur vi vo wae wo yo zh ); $LocaleFile{'default'} = ''; # aliases @@ -168,8 +168,8 @@ For example, C<Unicode::Collate::Locale-E<gt>new(locale =E<gt> 'ES')> returns a collator tailored for Spanish. C<$locale_name> may be suffixed with a Unicode script code (four-letter), -a Unicode region code, a Unicode language variant code. These codes are -case-insensitive, and separated with C<'_'> or C<'-'>. +a Unicode region (territory) code, a Unicode language variant code. +These codes are case-insensitive, and separated with C<'_'> or C<'-'>. E.g. C<en_US> for English in USA, C<az_Cyrl> for Azerbaijani in the Cyrillic script, C<es_ES_traditional> for Spanish in Spain (Traditional). @@ -211,7 +211,7 @@ if such a tailoring is passed to C<new()>. However C<change()> inherited from C<Unicode::Collate> allows such a tailoring that is reserved by C<locale>. Examples: - new(locale => 'ca')->change(backwards => undef) + new(locale => 'fr_ca')->change(backwards => undef) new(locale => 'da')->change(upper_before_lower => 0) new(locale => 'ja')->change(overrideCJK => undef) @@ -259,7 +259,7 @@ a combination of return values from C<getlocale> and C<locale_version>. cy Welsh da Danish de__phonebook German (umlaut as 'ae', 'oe', 'ue') - de_AT_phonebook German in Austria (umlaut primary greater) + de_AT_phonebook Austrian German (umlaut primary greater) ee Ewe eo Esperanto es Spanish @@ -270,10 +270,11 @@ a combination of return values from C<getlocale> and C<locale_version>. fi__phonebook Finnish (v and w as separate characters) fil Filipino fo Faroese - fr_CA French in Canada + fr_CA Canadian French gu Gujarati ha Hausa haw Hawaiian + he Hebrew hi Hindi hr Croatian hu Hungarian @@ -322,6 +323,7 @@ a combination of return values from C<getlocale> and C<locale_version>. uk Ukrainian ur Urdu vi Vietnamese + vo Volapuk wae Walser wo Wolof yo Yoruba @@ -392,7 +394,7 @@ Thus C<(normalization =E<gt> undef)> is less preferred. =item Collation reordering is not supported -The order of any groups including scripts are not changed. +The order of any groups including scripts is not changed. =back @@ -403,13 +405,13 @@ The order of any groups including scripts are not changed. af 30 = 1.8.1 ar 22.1 = 1.9.0 as 30 = 28 (without [reorder Beng..]) = 23 - az 22.1 = 1.8.1 (type="standard") + az 30 = 24 (type="standard" without [reorder Latn Cyrl]) be 30 = 28 (without [reorder Cyrl]) bn 30 = 28 (type="standard" wo [reorder Beng..]) = 2.0.1 bs 30 = 28 (type="standard": [import hr]) bs_Cyrl 30 = 28 (type="standard": [import sr]) ca 30 = 23 (alt="proposed" type="standard") - cs 22.1 = 1.8.1 (type="standard") + cs 30 = 1.8.1 (type="standard") cy 30 = 1.8.1 da 22.1 = 1.8.1 (type="standard") de__phonebook 30 = 2.0 (type="phonebook") @@ -418,7 +420,7 @@ The order of any groups including scripts are not changed. eo 30 = 1.8.1 es 30 = 1.9.0 (type="standard") es__traditional 30 = 1.8.1 (type="traditional") - et 22.1 = 1.8.1 + et 30 = 26 fa 22.1 = 1.8.1 fi 22.1 = 1.8.1 (type="standard" alt="proposed") fi__phonebook 22.1 = 1.8.1 (type="phonebook") @@ -426,13 +428,14 @@ The order of any groups including scripts are not changed. fo 22.1 = 1.8.1 (alt="proposed" type="standard") fr_CA 30 = 1.9.0 gu 30 = 28 (type="standard" wo [reorder Gujr..]) = 1.9.0 - ha 22.1 = 1.9.0 - haw 22.1 = 1.8.1 + ha 30 = 1.9.0 + haw 30 = 24 + he 30 = 28 (without [reorder Hebr]) = 23 hi 30 = 28 (without [reorder Deva..]) = 1.9.0 hr 22.1 = 1.9.0 (type="standard") hu 22.1 = 1.8.1 (alt="proposed" type="standard") hy 30 = 28 (without [reorder Armn]) = 1.8.1 - ig 22.1 = 1.8.1 + ig 30 = 1.8.1 is 22.1 = 1.8.1 (type="standard") ja 22.1 = 1.8.1 (type="standard") kk 30 = 28 (without [reorder Cyrl]) @@ -449,14 +452,13 @@ The order of any groups including scripts are not changed. mt 22.1 = 1.9.0 nb 22.1 = 2.0 (type="standard") nn 22.1 = 2.0 (type="standard") - nso 26 = 1.8.1 + nso [*] 26 = 1.8.1 om 22.1 = 1.8.1 or 30 = 28 (without [reorder Orya..]) = 1.9.0 pa 22.1 = 1.8.1 pl 30 = 1.8.1 ro 30 = 1.9.0 (type="standard") - sa 1.9.1 = 1.8.1 (type="standard" alt="proposed") - [now in /seed] + sa [*] 1.9.1 = 1.8.1 (type="standard" alt="proposed") se 22.1 = 1.8.1 (type="standard") si 30 = 28 (type="standard" wo [reorder Sinh..]) = 1.9.0 si__dictionary 30 = 28 (type="dictionary" wo [reorder Sinh..]) = 1.9.0 @@ -470,15 +472,16 @@ The order of any groups including scripts are not changed. ta 22.1 = 1.9.0 te 30 = 28 (without [reorder Telu..]) = 1.9.0 th 22.1 = 22 - tn 26 = 1.8.1 + tn [*] 26 = 1.8.1 to 22.1 = 22 tr 22.1 = 1.8.1 (type="standard") uk 30 = 28 (without [reorder Cyrl]) ug_Cyrl https://en.wikipedia.org/wiki/Uyghur_Cyrillic_alphabet ur 22.1 = 1.9.0 vi 22.1 = 1.8.1 - wae 22.1 = 2.0 - wo 1.9.1 = 1.8.1 [now in /seed] + vo 30 = 25 + wae 30 = 2.0 + wo [*] 1.9.1 = 1.8.1 yo 30 = 1.8.1 zh 22.1 = 1.8.1 (type="standard") zh__big5han 22.1 = 1.8.1 (type="big5han") @@ -488,6 +491,8 @@ The order of any groups including scripts are not changed. zh__zhuyin 22.1 = 22 (type='zhuyin' alt='short') -------------------------------------------------------------------- +[*] http://www.unicode.org/repos/cldr/tags/latest/seed/collation/ + =head1 AUTHOR The Unicode::Collate::Locale module for perl was written diff --git a/cpan/Unicode-Collate/Collate/Locale/af.pl b/cpan/Unicode-Collate/Collate/Locale/af.pl index d5d27259a1..870101fc8d 100644 --- a/cpan/Unicode-Collate/Collate/Locale/af.pl +++ b/cpan/Unicode-Collate/Collate/Locale/af.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0149 ; [.1D34.0020.0009] # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE ENTRY diff --git a/cpan/Unicode-Collate/Collate/Locale/ar.pl b/cpan/Unicode-Collate/Collate/Locale/ar.pl index 0ac753f2e4..5927b3bcb4 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ar.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ar.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0629 ; [.2296.0021.0002] # ARABIC LETTER TEH MARBUTA FE94 ; [.2296.0021.0019] # ARABIC LETTER TEH MARBUTA FINAL FORM diff --git a/cpan/Unicode-Collate/Collate/Locale/as.pl b/cpan/Unicode-Collate/Collate/Locale/as.pl index 79040d135d..709004744e 100644 --- a/cpan/Unicode-Collate/Collate/Locale/as.pl +++ b/cpan/Unicode-Collate/Collate/Locale/as.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0982 ; [.2640.0020.0002][.FFF1.0000.0000] # BENGALI SIGN ANUSVARA 0981 ; [.2640.0020.0002][.FFF2.0000.0000] # BENGALI SIGN CANDRABINDU diff --git a/cpan/Unicode-Collate/Collate/Locale/az.pl b/cpan/Unicode-Collate/Collate/Locale/az.pl index bf9bb93a52..4431231b25 100644 --- a/cpan/Unicode-Collate/Collate/Locale/az.pl +++ b/cpan/Unicode-Collate/Collate/Locale/az.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, # schwa doesn't require tailoring entry => <<'ENTRY', # for DUCET v8.0.0 00E7 ; [.1BF6.0020.0002] # LATIN SMALL LETTER C WITH CEDILLA @@ -47,5 +47,7 @@ 0051 ; [.1CE1.0020.0008] # LATIN CAPITAL LETTER Q 0078 ; [.1C94.0020.0002] # LATIN SMALL LETTER X 0058 ; [.1C94.0020.0008] # LATIN CAPITAL LETTER X +0077 ; [.1E9D.0020.0002] # LATIN SMALL LETTER W +0057 ; [.1E9D.0020.0008] # LATIN CAPITAL LETTER W ENTRY }; diff --git a/cpan/Unicode-Collate/Collate/Locale/be.pl b/cpan/Unicode-Collate/Collate/Locale/be.pl index 97ba9e13d9..48cb512c5b 100644 --- a/cpan/Unicode-Collate/Collate/Locale/be.pl +++ b/cpan/Unicode-Collate/Collate/Locale/be.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0451 ; [.1FD6.0020.0002] # CYRILLIC SMALL LETTER IO 0435 0308 ; [.1FD6.0020.0002] # CYRILLIC SMALL LETTER IO diff --git a/cpan/Unicode-Collate/Collate/Locale/bn.pl b/cpan/Unicode-Collate/Collate/Locale/bn.pl index db42edb19a..aebde407dc 100644 --- a/cpan/Unicode-Collate/Collate/Locale/bn.pl +++ b/cpan/Unicode-Collate/Collate/Locale/bn.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0982 ; [.2640.0020.0002][.FFF1.0000.0000] # BENGALI SIGN ANUSVARA 0983 ; [.2640.0020.0002][.FFF2.0000.0000] # BENGALI SIGN VISARGA diff --git a/cpan/Unicode-Collate/Collate/Locale/ca.pl b/cpan/Unicode-Collate/Collate/Locale/ca.pl index 37ea428b8d..220736cc83 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ca.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ca.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0063 0068 ; [.1BF6.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> 0063 0048 ; [.1BF6.0020.0007][.0000.0000.0002] # <LATIN SMALL LETTER C, LATIN CAPITAL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/cs.pl b/cpan/Unicode-Collate/Collate/Locale/cs.pl index 05c2a022fa..4f51ec42f7 100644 --- a/cpan/Unicode-Collate/Collate/Locale/cs.pl +++ b/cpan/Unicode-Collate/Collate/Locale/cs.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 010D ; [.1BF6.0020.0002] # LATIN SMALL LETTER C WITH CARON 0063 030C ; [.1BF6.0020.0002] # LATIN SMALL LETTER C WITH CARON diff --git a/cpan/Unicode-Collate/Collate/Locale/cy.pl b/cpan/Unicode-Collate/Collate/Locale/cy.pl index 4c38d0eb7f..b712b6fe5a 100644 --- a/cpan/Unicode-Collate/Collate/Locale/cy.pl +++ b/cpan/Unicode-Collate/Collate/Locale/cy.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 0063 0068 ; [.1BF6.0020.0002] # <LATIN SMALL LETTER C, LATIN SMALL LETTER H> 0043 0068 ; [.1BF6.0020.0007] # <LATIN CAPITAL LETTER C, LATIN SMALL LETTER H> diff --git a/cpan/Unicode-Collate/Collate/Locale/da.pl b/cpan/Unicode-Collate/Collate/Locale/da.pl index c27dd82c4e..b49098be2d 100644 --- a/cpan/Unicode-Collate/Collate/Locale/da.pl +++ b/cpan/Unicode-Collate/Collate/Locale/da.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, upper_before_lower => 1, entry => <<'ENTRY', # for DUCET v8.0.0 0111 ; [.1C0A.0021.0002] # LATIN SMALL LETTER D WITH STROKE diff --git a/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl b/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl index d1ea541974..4183e660ce 100644 --- a/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl +++ b/cpan/Unicode-Collate/Collate/Locale/de_at_ph.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 00E4 ; [.1BC3.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS 0061 0308 ; [.1BC3.0020.0002] # LATIN SMALL LETTER A WITH DIAERESIS diff --git a/cpan/Unicode-Collate/Collate/Locale/de_phone.pl b/cpan/Unicode-Collate/Collate/Locale/de_phone.pl index 4be777f06a..0c8933d9d0 100644 --- a/cpan/Unicode-Collate/Collate/Locale/de_phone.pl +++ b/cpan/Unicode-Collate/Collate/Locale/de_phone.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, entry => <<'ENTRY', # for DUCET v8.0.0 00E4 ; [.1BC2.0021.0002][.1C25.0021.0002] # LATIN SMALL LETTER A WITH DIAERESIS 0061 0308 ; [.1BC2.0021.0002][.1C25.0021.0002] # LATIN SMALL LETTER A WITH DIAERESIS diff --git a/cpan/Unicode-Collate/Collate/Locale/ee.pl b/cpan/Unicode-Collate/Collate/Locale/ee.pl index ebbc8138c2..652326af43 100644 --- a/cpan/Unicode-Collate/Collate/Locale/ee.pl +++ b/cpan/Unicode-Collate/Collate/Locale/ee.pl @@ -1,5 +1,5 @@ +{ - locale_version => 1.18, + locale_version => 1.19, # d-tail, open-e, f-hook, gamma, eng, open-o, v-hook don't require tailoring entry => <<'ENTRY', # for DUCET v8.0.0 0302 ; [.0000.0029.0002] # COMBINING CIRCUMFLEX ACCENT diff --git a/cpan/Unicode-Collate/Collate/Locale/eo.pl b/cpan/Unicode-Collate/Collate/Locale/eo.pl index 6a006a4d65..116f950eac 100644 --- a/cpan/Unicode-Collate/Collate/Locale/eo.pl **** PATCH TRUNCATED AT 2000 LINES -- 1624 NOT SHOWN **** -- Perl5 Master Repository
