diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 08:36:37 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 08:36:37 +0000 |
| commit | 2e4f0af00f85ca228bcf5fa919882359411c652a (patch) | |
| tree | 6317ef3d0c352a8d7496139f34277e224fe3d4ac /test/rdoc | |
| parent | 7b14512bee222bdb6392e865b00ef4b4c42b9364 (diff) | |
| download | ruby-2e4f0af00f85ca228bcf5fa919882359411c652a.tar.gz | |
* ext/json/*, test/json/*: Reverted r50231. Because it's not works with
cross-compile environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rdoc')
| -rw-r--r-- | test/rdoc/test_rdoc_generator_darkfish.rb | 3 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_generator_json_index.rb | 3 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_rubygems_hook.rb | 5 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_servlet.rb | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb index 204983d97b..fc77e4b105 100644 --- a/test/rdoc/test_rdoc_generator_darkfish.rb +++ b/test/rdoc/test_rdoc_generator_darkfish.rb @@ -225,4 +225,5 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase "#{filename} is not hard-linked" end -end if defined?(JSON) +end + diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb index c95820ca1e..9283fd9b76 100644 --- a/test/rdoc/test_rdoc_generator_json_index.rb +++ b/test/rdoc/test_rdoc_generator_json_index.rb @@ -320,4 +320,5 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase assert_equal 'cd', @g.search_string('C d') end -end if defined?(JSON) +end + diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb index 0d5e11ab89..960afc9ed4 100644 --- a/test/rdoc/test_rdoc_rubygems_hook.rb +++ b/test/rdoc/test_rdoc_rubygems_hook.rb @@ -66,7 +66,7 @@ class TestRDocRubygemsHook < Gem::TestCase @hook.document 'darkfish', options, @a.doc_dir('rdoc') assert @hook.rdoc_installed? - end if defined?(JSON) + end def test_generate FileUtils.mkdir_p @a.doc_dir @@ -105,7 +105,7 @@ class TestRDocRubygemsHook < Gem::TestCase assert_equal %w[README lib], rdoc.options.files.sort assert_equal 'MyTitle', rdoc.store.main - end if defined?(JSON) + end def test_generate_configuration_rdoc_array Gem.configuration[:rdoc] = %w[-A] @@ -248,3 +248,4 @@ class TestRDocRubygemsHook < Gem::TestCase end end + diff --git a/test/rdoc/test_rdoc_servlet.rb b/test/rdoc/test_rdoc_servlet.rb index c9449f3631..143e2f225b 100644 --- a/test/rdoc/test_rdoc_servlet.rb +++ b/test/rdoc/test_rdoc_servlet.rb @@ -531,4 +531,5 @@ class TestRDocServlet < RDoc::TestCase store.save end -end if defined?(JSON) +end + |