From 8f39f64579b32d7a03d00aa4b5b6f5e95bc8413c Mon Sep 17 00:00:00 2001 From: duerst Date: Sun, 3 Jul 2016 09:51:46 +0000 Subject: * test/ruby/enc/test_case_comprehensive.rb, test_regex_casefold.rb, test/test_unicode_normalize.rb: Replace UNICODE_VERSION from UnicodeNormalize with RbConfig::CONFIG['UNICODE_VERSION'] from feature 12460. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/ruby/enc/test_case_comprehensive.rb | 3 +-- test/ruby/enc/test_regex_casefold.rb | 3 +-- test/test_unicode_normalize.rb | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fc9776387..4402ded9fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 3 18:51:42 2016 Martin Duerst + + * test/ruby/enc/test_case_comprehensive.rb, test_regex_casefold.rb, + test/test_unicode_normalize.rb: Replace UNICODE_VERSION from + UnicodeNormalize with RbConfig::CONFIG['UNICODE_VERSION'] from + feature 12460. + Sun Jul 3 06:04:09 2016 Eric Wong * process.c (disable_child_handler_fork_child): simplify diff --git a/test/ruby/enc/test_case_comprehensive.rb b/test/ruby/enc/test_case_comprehensive.rb index 8ee8149fc4..ebddae12e1 100644 --- a/test/ruby/enc/test_case_comprehensive.rb +++ b/test/ruby/enc/test_case_comprehensive.rb @@ -2,10 +2,9 @@ # Copyright © 2016 Martin J. Dürst (duerst@it.aoyama.ac.jp) require "test/unit" -require 'unicode_normalize/normalize' # only for UNICODE_VERSION class TestComprehensiveCaseFold < Test::Unit::TestCase - UNICODE_VERSION = UnicodeNormalize::UNICODE_VERSION + UNICODE_VERSION = RbConfig::CONFIG['UNICODE_VERSION'] UNICODE_DATA_PATH = "../../../enc/unicode/data/#{UNICODE_VERSION}" def self.hex2utf8(s) diff --git a/test/ruby/enc/test_regex_casefold.rb b/test/ruby/enc/test_regex_casefold.rb index 7df8f8b4ab..5c98272d2d 100644 --- a/test/ruby/enc/test_regex_casefold.rb +++ b/test/ruby/enc/test_regex_casefold.rb @@ -1,11 +1,10 @@ # Copyright Kimihito Matsui (松井 仁人) and Martin J. Dürst (duerst@it.aoyama.ac.jp) require "test/unit" -require 'unicode_normalize/normalize' # only for UNICODE_VERSION class TestCaseFold < Test::Unit::TestCase - UNICODE_VERSION = UnicodeNormalize::UNICODE_VERSION + UNICODE_VERSION = RbConfig::CONFIG['UNICODE_VERSION'] CaseTest = Struct.new :source, :target, :kind, :line def check_downcase_properties(expected, start, *flags) diff --git a/test/test_unicode_normalize.rb b/test/test_unicode_normalize.rb index be1bf5f49b..347741dcb2 100644 --- a/test/test_unicode_normalize.rb +++ b/test/test_unicode_normalize.rb @@ -8,7 +8,7 @@ require 'unicode_normalize/normalize' class TestUnicodeNormalize < Test::Unit::TestCase - UNICODE_VERSION = UnicodeNormalize::UNICODE_VERSION + UNICODE_VERSION = RbConfig::CONFIG['UNICODE_VERSION'] UNICODE_DATA_PATH = "../enc/unicode/data/#{UNICODE_VERSION}" def self.expand_filename(basename) -- cgit v1.2.3