summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:21:39 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-30 09:21:39 +0000
commit4a4611687610aee31b089c7a9f62507a326d5d4d (patch)
tree5c46910f4bee223ebc53c61419322e509e60b34f /test
parent863899e42b2f1eb7f64496b0f4e2f8787ede5c9d (diff)
downloadruby-4a4611687610aee31b089c7a9f62507a326d5d4d.tar.gz
ruby-4a4611687610aee31b089c7a9f62507a326d5d4d.tar.xz
ruby-4a4611687610aee31b089c7a9f62507a326d5d4d.zip
merges r20338 from trunk into ruby_1_9_1.
* strftime.c (rb_strftime): The default precision should be 1, not 0. [ruby-dev:37155] * test/ruby/test_time.rb (test_strftime): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_time.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 3a9b05580..d3b698264 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -444,5 +444,10 @@ class TestTime < Test::Unit::TestCase
assert_equal(" 2", t.strftime("%l"))
assert_equal("02", t.strftime("%0l"))
assert_equal(" 2", t.strftime("%_l"))
+
+ # [ruby-dev:37155]
+ t = Time.mktime(1970, 1, 18)
+ assert_equal("0", t.strftime("%w"))
+ assert_equal("7", t.strftime("%u"))
end
end