do not call initialize of ruby from builtin

yast · Feb 10, 2014 · 2c640c0 · 2c640c0
1 parent 1633615
commit 2c640c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/binary/Builtin.cc b/src/binary/Builtin.cc
@@ -31,7 +31,6 @@ extern "C" {
 #include "Y2YCPTypeConv.h"
 #include "Y2RubyTypeConv.h"
 #include "RubyLogger.h"
-#include "YRuby.h"
 #include "Y2RubyUtils.h"
 
 static VALUE rb_mSCR;
@@ -49,7 +48,6 @@ extern "C" {
 
   static VALUE call_builtin(const string &qualified_name, int argc, VALUE *argv)
   {
-    YRuby::yRuby();
     extern StaticDeclaration static_declarations;
     YaST::ee.setFilename(RSTRING_PTR(argv[0]));
     YaST::ee.setLinenumber(FIX2INT(argv[1]));

diff --git a/tests/ruby/test_helper.rb b/tests/ruby/test_helper.rb
@@ -6,5 +6,6 @@
 end
 $:.unshift binary_path # yastx.so
 $:.unshift "#{ROOT_DIR}/src/ruby"       # yast.rb
+ENV["LD_LIBRARY_PATH"] = binary_path
 ENV["Y2DIR"] = File.dirname(__FILE__) + "/test_module"