From f9c85174c3fcba35e781bb29905d2a117dc23ca7 Mon Sep 17 00:00:00 2001 From: Bohuslav Kabrda Date: Thu, 1 Dec 2011 08:25:22 +0100 Subject: [PATCH] Fix availability test for Ruby 1.9 --- test/unit/test_availability.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/unit/test_availability.rb b/test/unit/test_availability.rb index b83c307..acb01eb 100644 --- a/test/unit/test_availability.rb +++ b/test/unit/test_availability.rb @@ -136,9 +136,17 @@ def test_default_compiler_should_be_from_rbconfig end def test_default_include_dir_should_be_from_rbconfig - expected = [Config::CONFIG['includedir'], Config::CONFIG["archdir"], - Config::CONFIG['sitelibdir'], "."] - + # Ruby 1.9 + if Config::CONFIG['rubyhdrdir'] + # Have to add exactly what is in the availiability.rb for Ruby 1.9, since + # there is no special RbConfig::CONFIG field for that + expected = [RbConfig::CONFIG['includedir'], Config::CONFIG['rubyhdrdir'] + + "/" + Config::CONFIG['arch'], RbConfig::CONFIG["archdir"], + RbConfig::CONFIG['sitelibdir'], "."] + else + expected = [Config::CONFIG['includedir'], Config::CONFIG["archdir"], + Config::CONFIG['sitelibdir'], "."] + end assert_equal expected, @avail.send(:instance_variable_get, :@includes) end -end \ No newline at end of file +end