aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/ruby/enc/test_case_comprehensive.rb3
-rw-r--r--test/ruby/enc/test_regex_casefold.rb3
-rw-r--r--test/test_unicode_normalize.rb2
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 <duerst@it.aoyama.ac.jp>
+
+ * 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 <e@80x24.org>
* 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)