Commit graph

5576 commits

Author SHA1 Message Date
naruse
ba8a74314e skip addresses whose interface is set as POINTOPOINT.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-10 08:29:33 +00:00
naruse
08b3a446e5 Skip IPv6 addresses whose interface is set as IFDISABLED.
FreeBSD 9.0 with default setting (ipv6_activate_all_interfaces
is not YES) sets IFDISABLED to interfaces which don't have
global IPv6 address.
Link-local IPv6 addresses on those interfaces don't work.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-10 03:47:10 +00:00
nobu
989f5a1e6f test/minitest: Correct requiring path to metametameta.rb.
* test/minitest/test_minitest_mock.rb: Correct requiring path to
  metametameta.rb.
* test/minitest/test_minitest_unit.rb: Correct requiring path to
  metametameta.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-10 01:55:38 +00:00
shugo
2e63cd97c1 * lib/net/imap.rb (decode_utf7, encode_utf7): refactored by
Nobuyoshi Nakada, to use String#encode.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-09 07:03:19 +00:00
nobu
e62c35fb8f * test/rubygems/test_gem_remote_fetcher.rb: skip OpenSSL dependent
tests if not available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-09 04:26:29 +00:00
ryan
a213c2ed9c Imported minitest 3.0.0 (r7435) w/ fixes for rubygems. 10955 tests, 2253343 assertions, 1 failures, 1 errors, 28 skips minus drb tests on x86_64-darwin11.3.0 and reviewed by drbrain
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-09 04:09:25 +00:00
shirosaki
5ccee663e9 * include/ruby/win32.h (FD_SET): change function to macro.
To avoid buffer overflow when smaller FD_SETSISE is used in ext
  libraries.

* win32/win32.c (rb_w32_fdset): this function is not used anymore.
  But we leave this for compatibility.

* win32/win32.c (rb_w32_select_with_thread): fix SEGV when smaller
  FD_SETSISE is used in ext libraries. Dereference of fd_set pointer
  causes SEGV.

* test/-ext-/win32/test_fd_setsize.rb(TestFdSetSize): add tests for
  above.
* ext/-test-/win32/fd_setsize/depend: ditto.
* ext/-test-/win32/fd_setsize/extconf.rb: ditto.
* ext/-test-/win32/fd_setsize/fd_setsize.c: ditto.

  [ruby-core:44588] [Bug #6352]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-08 12:47:25 +00:00
shirosaki
7e134cf71e * io.c (io_unread): fix IO#pos with mode 'r' bug on Windows.
If the end of reading buffer is CR, io_unread() needs to unread one
  more byte.
  [ruby-core:44874] [Bug #6401]

* test/ruby/test_io_m17n.rb (TestIO_M17N#test_pos_with_buffer_end_cr):
  add a test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-08 12:01:05 +00:00
nobu
c45d780b83 test/mkmf/base.rb: hide compiler output
* test/mkmf/base.rb (TestMkmf::Capture#reopen): reopen replaced IO
  too, to hide compiler output.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-08 06:50:05 +00:00
nobu
63a164f32e test: fix test conditions
* test/csv/test_features.rb (TestCSV#test_gzip_reader_bug_fix): test
  only if zlib is available.

* test/csv/test_features.rb (TestCSV#test_gzip_writer_bug_fix): ditto.

* test/open-uri/test_open-uri.rb (TestOpenURI#test_content_encoding):
  ditto.

* test/rexml/test_order.rb (OrderTester#test_more_ordering): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-08 06:50:03 +00:00
nobu
a0d2cd2e1e test: why believe source directories are writable always?
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-08 06:49:59 +00:00
usa
844ddfdd0d * test/minitest/metametameta.rb (MetaMetaMetaTestCase#assert_report):
support drive letter on Windows.  yes, the original code is metameta.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-08 02:23:15 +00:00
nobu
fca2ac964d test/testunit: fix for recent minitest
* test/testunit/test_hideskip.rb (TestHideSkip#test_hideskip):
  MiniTest#puke now reports Skipped messages only if verbose mode.
* test/testunit/test_sorting.rb (TestTestUnitSorting#test_sorting):
  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 18:54:09 +00:00
naruse
49331ddec7 * lib/minitest/unit.rb (assert_match): refix of r35563.
r35563 breaks the intention of the original change.
  68858105b2
* lib/minitest/unit.rb (refute_match): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 17:49:53 +00:00
naruse
40f1939614 Correct requiring path to metametameta.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 17:49:48 +00:00
nobu
8545d2f4b9 test_ssl.rb: test only if necessary option is available.
* test/openssl/test_ssl.rb (test_forbid_tls_v1_{1,2}_{for_client,from_server}):
  test only if necessary option is available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 17:18:55 +00:00
naruse
5a00be2bf7 * ext/json: Merge JSON 1.7.1.
e5b9a9465c

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 16:00:49 +00:00
emboss
5f7be3150f * ext/openssl/ossl_ssl.c: add support for option flags
OpenSSL::SSL::OP_NO_TLSv1_1
  OpenSSL::SSL::OP_NO_TLSv1_2
  to allow blocking specific TLS versions. Thanks to Justin Guyett for
  pointing this out to me.
* test/openssl/test_ssl.rb: add tests to assert correct behavior when
  blocking certain versions of TLS/SSL both on server and client side.
  Also refactored tests to reduce boilerplate code a little.
* test/openssl/utils.rb: rescue Errno::ECONNRESET for tests where
  client rejects the connection because a forbidden protocol version
  was used.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 11:57:01 +00:00
shugo
9be3aa1767 * lib/net/imap.rb (body_type_attachment): parse body type
"ATTACHMENT". [ruby-core:44849] [Bug #6397]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 04:05:44 +00:00
naruse
0fce0545b6 * ext/bigdecimal/bigdecimal.c (Init_bigdecimal): define IDs before
they are used. [ruby-core:44900] [Bug #6406]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 02:03:28 +00:00
nobu
298258891d use assert_equal, assert_match, and so on.
* test/fileutils/fileasserts.rb: use assert_equal, assert_match, and so on.
* test/ruby/enc/test_utf16.rb, test/ruby/enc/test_utf32.rb,
  test/ruby/test_io_m17n.rb (assert_str_equal): ditto.
* test/rubygems/test_gem_remote_fetcher.rb
  (assert_data_from_{server,proxy}): ditto.
* test/test_pstore.rb (test_thread_safe): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 01:23:07 +00:00
nobu
b5ba059a0b test_gem_installer.rb: fix argument order
* test/rubygems/test_gem_installer.rb (TestGemInstaller#test_dir): fix
  argument order.  expected value must come first.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 01:16:32 +00:00
emboss
060184c347 * ext/openssl/ossl_ssl.c: support TLSv1.1 & TLSv1.1. Add
SSLContext#version to inspect the version that was negotiated for
  a given connection.
* ext/openssl/extconf.rb: detect TLS 1.1 & 1.2 support.
* test/openssl/test_ssl.rb: add tests for TLS 1.1 & 1.2 given they
  are supported by the native OpenSSL being used. 



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-06 22:26:08 +00:00
naruse
ae4fa7951f Revert r35443.
Revert "* test/rubygems/test_gem_installer.rb: fix broken test for r35541."
* r35541 breaks exist tests, it should be a bug unless it is inteneded.
  there seems no such intention.
  68858105b2
* assert('mswin32' =~ Gem::Platform.local) won't output any useful
  information when it fails.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-05 13:15:29 +00:00
ayumin
f406e3ac63 * test/rubygems/test_gem_installer.rb: fix broken test for r35541.
[ruby-core:44884][Bug #6405]
* test/rubygems/test_gem_platform.rb: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-05 09:27:06 +00:00
ryan
6af843b9cb Imported minitest 2.12.1 (r7323)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-04 21:46:01 +00:00
naruse
95d4b3ba49 * test/zlib/test_zlib.rb (test_inflate): add a test for Zlib.inflate.
patched by headius (Charles Nutter). [ruby-core:44859] [Bug #6398]

* test/zlib/test_zlib.rb (test_deflate): add a test for Zlib.deflate.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-04 17:07:18 +00:00
naruse
afd9ce9d9e * io.c (parse_mode_enc): remove warnings 'Ignoring internal encoding'.
[ruby-core:44455] [Bug #6324]

* io.c (io_encoding_set): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-04 16:14:51 +00:00
naruse
66b0d426ed rescue if it cannnot load psych.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-04 13:26:39 +00:00
naruse
09063f9d30 Embed backtrace to debug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-03 22:50:30 +00:00
naruse
8109c530b2 * lib/rdoc/parser.rb (RDoc.binary?): fix wrong regexp.
[ruby-core:44798] [Bug #6393]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-03 22:20:26 +00:00
nobu
9bee6cf51f rdoc: --extension option fix
* lib/rdoc/parser.rb (RDoc.alias_extension): a real file is irrelevant
  to aliasing.  [ruby-core:44796][Bug #6392]
* lib/rdoc/parser.rb (RDoc.zip?): non-existent file will not be a zip
  file.
* lib/rdoc/parser.rb (RDoc.can_parse_by_name): accept aliased
  extension file names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-03 16:33:22 +00:00
nobu
1348e3b9ac rdoc: non-binary multibyte
* lib/rdoc/parser.rb (RDoc.binary?): binary read data may have
  incomplete multibyte sequence.  [ruby-core:44798][Bug #6393]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-03 16:31:25 +00:00
nobu
9cf2170e78 * parse.y (parser_yylex): allow spaces between lambda arrow and
parenthesis.  [ruby-dev:45605][Feature #6390]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-02 14:21:23 +00:00
kouji
7c602ea07f * ext/readline/readline.c (Readline.special_prefixes=)
(Readline.special_prefixes): new function. An original patch was
  created by nagachika. [Feature #5784]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-02 00:47:57 +00:00
kouji
7a4b214558 * ext/readline/readline.c (Readline.pre_input_hook)
(Readline.insert_text, Readline.redisplay): new function. An
  original patch was created by nagachika. [Feature #5785]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-01 13:21:55 +00:00
usa
633cebb0ef * test/ruby/test_settracefunc.rb: ignore traces from another threads
because Kernel.set_trace_func affects other threads.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-01 01:56:25 +00:00
akr
52af87a5a7 add an assertion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-30 14:45:31 +00:00
akr
7d89ecdc52 * lib/fileutils.rb (copy_metadata): use File.lchown and File.lchmod to
update meta data of symlinks.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-30 14:37:54 +00:00
nagachika
c40e6f8257 * test/ruby/test_continuation.rb (tracing_with_set_trace_func): don't
call Continuation from other threads. [ruby-dev:45596] [Bug #6382]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-30 14:09:36 +00:00
ayumin
3893159530 * test/net/http/test_https.rb: update test for r35494
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-30 03:51:03 +00:00
tenderlove
75cff1d7d0 add a test for yaml ast roundtripping
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-28 22:24:01 +00:00
nobu
3380974143 * parse.y (assoc, parser_yylex): add syntax to splat keyword hash.
[ruby-core:44591][Feature #6353]
* compile.c (compile_array_): generate keyword splat insns.
* vm.c (m_core_hash_merge_kwd): merge keyword hash into intermediate
  hash.  leftward argument is prior currently.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-28 21:12:05 +00:00
nobu
0a68f1200b * test/readline/test_readline.rb (setup): avoid affected by user's
inputrc file.  [ruby-dev:45584][Bug #6357]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-27 01:58:21 +00:00
nobu
664a13b732 test/readline/test_readline.rb: suppress bell
* test/readline/test_readline.rb (replace_stdio, with_pipe): suppress bell.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-27 01:41:02 +00:00
akr
1413510ed2 * ext/socket/raddrinfo.c (init_unix_addrinfo): support the longest
path in sockaddr_un.
  (inspect_sockaddr): ditto.
  (addrinfo_mdump): ditto.
  (addrinfo_mload): ditto.
  (rsock_unixpath_str): new function.
  (rsock_unixpath): removed.
  (rsock_unixaddr): use rsock_unixpath_str.

* ext/socket/socket.c (sock_s_pack_sockaddr_un): support the longest
  path in sockaddr_un.
  (sock_s_unpack_sockaddr_un): ditto.
  (sock_s_gethostbyaddr): unused variable removed.

* ext/socket/unixsocket.c (rsock_init_unixsock): support the longest
  path in sockaddr_un.

* ext/socket/rubysocket.h (rsock_unixpath_str): declared.
  (rsock_unixpath): removed.

* test/socket/test_unix.rb: comment out test_nul because abstract unix
  sockets may contain NULs.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-26 03:34:12 +00:00
nagachika
2bc4268e79 * test/optparse/test_summary.rb (test_summary_containing_space): add
test for r35467. OptionParser#to_a shouldn't split banner by spaces.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-25 16:36:14 +00:00
nobu
3c2f707f16 * lib/optparse.rb (OptionParser#to_a): split for each lines.
[ruby-dev:45568][Bug #6348]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 20:46:14 +00:00
naruse
276d82a7c8 Cent OS 5.6 wakes up in 4.989596sec from sleep(5).
20120424T070102Z.log.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 12:17:02 +00:00
usa
756ffef448 * enc/euc_jp.c: added EUC-JP-2004 and its alias EUC-JISX0213.
[ruby-dev:45571] [Feature #6349]
  Requested by Kyouhei Yanagita <yanagi@shakenbu.org>.

* enc/trans/japanese_euc.trans: ditto.

* enc/trans/JIS/JISX0213-[12]%UCS@{BMP,SIP}.src: JIS X 0213:2004 ->
  Unicode mapping table from NetBSD.

* enc/trans/JIS/UCS@{BMP,SIP}%JISX0213-[12].src: Unicode -> JIX X
  0213:2004 mapping table from NetBSD.

* tool/transcode-tblgen.rb: added SIP support.

* test/ruby/test_transcode.rb: tests of above changes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 11:14:18 +00:00