From 5f9986c6d22515f325d22fa6cebdc4bf8fc5b823 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Jan 2008 12:11:06 +0000
Subject: * enc/us_ascii.c: wrong alias name: ANSI_X3.4-1986.

* rubytest.rb: add -I#{srcdir} to load encoding DLL.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 6 ++++++
 enc/us_ascii.c | 4 ++--
 rubytest.rb    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adb2a5e6d..19a9db3f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 14 21:10:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* enc/us_ascii.c: wrong alias name: ANSI_X3.4-1986.
+
+	* rubytest.rb: add -I#{srcdir} to load encoding DLL.
+
 Mon Jan 14 18:53:58 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* thread.c: clear thread structure.
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
index 165932d1a..8a18966ee 100644
--- a/enc/us_ascii.c
+++ b/enc/us_ascii.c
@@ -27,5 +27,5 @@ OnigEncodingDefine(us_ascii, US_ASCII) = {
   onigenc_always_true_is_allowed_reverse_match
 };
 ENC_ALIAS("ASCII", "US-ASCII");
-ENC_ALIAS("ANSI_X3.4-1986", "US-ASCII");
-ENC_ALIAS("646", "US-ASCII");
\ No newline at end of file
+ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII");
+ENC_ALIAS("646", "US-ASCII");
diff --git a/rubytest.rb b/rubytest.rb
index fb836735f..eecc58825 100755
--- a/rubytest.rb
+++ b/rubytest.rb
@@ -37,7 +37,7 @@ $stderr.reopen($stdout)
 error = ''
 
 srcdir = File.dirname(__FILE__)
-`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line|
+`#{ruby} -I#{srcdir} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line|
   if line =~ /^end of test/
     print "\ntest succeeded\n"
     exit true
-- 
cgit