summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--enc/us_ascii.c4
-rwxr-xr-xrubytest.rb2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index adb2a5e6d4..19a9db3f3b 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 165932d1ae..8a18966ee3 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 fb836735f5..eecc588256 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