diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-28 12:02:08 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-28 12:02:08 +0000 |
commit | 75adc77e7c98ac468a79293d551709c7ee531868 (patch) | |
tree | 7b727007b046ec0c82a714f1855fa6362a2c5b24 | |
parent | 135ed12ea6b4a0a39a88eba7130b7b371b560ee9 (diff) | |
download | ruby-75adc77e7c98ac468a79293d551709c7ee531868.tar.gz |
Update to ruby/spec@ca32ae2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | spec/rubyspec/optional/capi/ext/jruby.h | 10 | ||||
-rw-r--r-- | spec/rubyspec/optional/capi/ext/rubinius.h | 8 | ||||
-rw-r--r-- | spec/rubyspec/optional/capi/ext/rubyspec.h | 15 | ||||
-rw-r--r-- | spec/rubyspec/optional/capi/ext/truffleruby.h | 6 | ||||
-rw-r--r-- | spec/rubyspec/optional/capi/spec_helper.rb | 11 |
5 files changed, 4 insertions, 46 deletions
diff --git a/spec/rubyspec/optional/capi/ext/jruby.h b/spec/rubyspec/optional/capi/ext/jruby.h deleted file mode 100644 index 00a9789f14..0000000000 --- a/spec/rubyspec/optional/capi/ext/jruby.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef RUBYSPEC_CAPI_JRUBY_H -#define RUBYSPEC_CAPI_JRUBY_H - -/* #undef any HAVE_ defines that JRuby does not have. */ -#undef HAVE_RB_DEFINE_HOOKED_VARIABLE -#undef HAVE_RB_DEFINE_VARIABLE - -#undef HAVE_RB_EXEC_RECURSIVE - -#endif diff --git a/spec/rubyspec/optional/capi/ext/rubinius.h b/spec/rubyspec/optional/capi/ext/rubinius.h deleted file mode 100644 index 7ddf73790d..0000000000 --- a/spec/rubyspec/optional/capi/ext/rubinius.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RUBYSPEC_CAPI_RUBINIUS_H -#define RUBYSPEC_CAPI_RUBINIUS_H - -/* #undef any HAVE_ defines that Rubinius does not have. */ -#undef HAVE_RB_DEFINE_HOOKED_VARIABLE -#undef HAVE_RB_DEFINE_VARIABLE - -#endif diff --git a/spec/rubyspec/optional/capi/ext/rubyspec.h b/spec/rubyspec/optional/capi/ext/rubyspec.h index aa0f4def19..9cba34b888 100644 --- a/spec/rubyspec/optional/capi/ext/rubyspec.h +++ b/spec/rubyspec/optional/capi/ext/rubyspec.h @@ -595,19 +595,4 @@ /* Util */ #define HAVE_RB_SCAN_ARGS 1 -/* Now, create the differential set. The format of the preprocessor directives - * is significant. The alternative implementations should define RUBY because - * some extensions depend on that. But only one alternative implementation - * macro should be defined at a time. The conditional is structured so that if - * no alternative implementation is defined then MRI is assumed. - */ - -#if defined(RUBINIUS) -#include "rubinius.h" -#elif defined(JRUBY) -#include "jruby.h" -#elif defined(TRUFFLERUBY) -#include "truffleruby.h" -#endif - #endif diff --git a/spec/rubyspec/optional/capi/ext/truffleruby.h b/spec/rubyspec/optional/capi/ext/truffleruby.h deleted file mode 100644 index 99976a18a4..0000000000 --- a/spec/rubyspec/optional/capi/ext/truffleruby.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef RUBYSPEC_CAPI_TRUFFLERUBY_H -#undef RUBYSPEC_CAPI_TRUFFLERUBY_H - -// All features are available - -#endif diff --git a/spec/rubyspec/optional/capi/spec_helper.rb b/spec/rubyspec/optional/capi/spec_helper.rb index 7e043f80b5..7242a134e7 100644 --- a/spec/rubyspec/optional/capi/spec_helper.rb +++ b/spec/rubyspec/optional/capi/spec_helper.rb @@ -22,21 +22,20 @@ def compile_extension(name) end ext = "#{name}_spec" - source = "#{extension_path}/#{ext}.c" lib = "#{object_path}/#{ext}.#{RbConfig::CONFIG['DLEXT']}" ruby_header = "#{RbConfig::CONFIG['rubyhdrdir']}/ruby.h" return lib if File.exist?(lib) and - File.mtime(lib) > File.mtime(source) and - File.mtime(lib) > File.mtime(ruby_header) and File.mtime(lib) > File.mtime("#{extension_path}/rubyspec.h") and + File.mtime(lib) > File.mtime("#{extension_path}/#{ext}.c") and + File.mtime(lib) > File.mtime(ruby_header) and true # sentinel # Copy needed source files to tmpdir tmpdir = tmp("cext_#{name}") Dir.mkdir(tmpdir) begin - ["jruby.h", "rubinius.h", "truffleruby.h", "rubyspec.h", "#{ext}.c"].each do |file| + ["rubyspec.h", "#{ext}.c"].each do |file| cp "#{extension_path}/#{file}", "#{tmpdir}/#{file}" end @@ -58,9 +57,7 @@ def compile_extension(name) raise "make failed:\n#{output}" unless $?.success? $stderr.puts output if debug - Dir.glob("*.#{RbConfig::CONFIG['DLEXT']}") do |file| - cp file, "#{object_path}/#{file}" - end + cp File.basename(lib), lib end ensure rm_r tmpdir |