tags 680824 + pach
thanks

Hi Daniel!

On Sun, Jul 08, 2012 at 07:17:13PM +0200, Lucas Nussbaum wrote:
> Relevant part:
> > make[6]: Entering directory `/«PKGBUILDDIR»'
> > make[6]: Nothing to be done for `all'.
> > make[6]: Leaving directory `/«PKGBUILDDIR»'
> > Running test_basic.rb
> > Setting up keymap on new server as us
> > /usr/lib/ruby/1.9.1/rubygems/custom_require.rb:36:in `require': cannot load 
> > such file -- xdo_test_helper (LoadError)
> >     from /usr/lib/ruby/1.9.1/rubygems/custom_require.rb:36:in `require'
> >     from test_basic.rb:5:in `<main>'
> > make[5]: *** [do-test] Error 1

(Note I'm not a ruby expert)

It seems that ruby 1.9.2 hat a change to not include anymore the
current path[1]. But one can use require_relative[2,3].

 [1]: http://www.ruby-lang.org/en/news/2010/08/18/ruby-1-9.2-released/
 [2]: 
http://stackoverflow.com/questions/9154365/ruby-loaderror-cannot-load-such-file
 [3]: 
http://stackoverflow.com/questions/4965556/why-isnt-current-directory-on-my-ruby-path

Attached is a patch to do that. Then the testsuite runs again here,
but there are still tests failing now.

Is this the correct approach?

Regards,
Salvatore
Description: Fix FTBFS with ruby (>= 1.9.2)
 Fix "FTBFS: /usr/lib/ruby/1.9.1/rubygems/custom_require.rb:36:in
 `require': cannot load such file -- xdo_test_helper (LoadError)". ruby
  1.9.2 does not include anymore the current directory to include path.
Origin: vendor
Bug-Debian: http://bugs.debian.org/680824
Forwarded: no
Author: Salvatore Bonaccorso <car...@debian.org>
Last-Update: 2012-07-14

--- a/t/test_basic.rb
+++ b/t/test_basic.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolBasicTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_chaining.rb
+++ b/t/test_chaining.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolChainingTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_behave_screen_edge.rb
+++ b/t/test_cmd_behave_screen_edge.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandBehaveScreenEdgeTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_exec.rb
+++ b/t/test_cmd_exec.rb
@@ -3,7 +3,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandExecTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_getwindowname.rb
+++ b/t/test_cmd_getwindowname.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandGetWindowPidTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_getwindowpid.rb
+++ b/t/test_cmd_getwindowpid.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandGetWindowPidTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_key.rb
+++ b/t/test_cmd_key.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandKeyTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_windowfocus.rb
+++ b/t/test_cmd_windowfocus.rb
@@ -3,7 +3,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandWindowFocusTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_windowmap.rb
+++ b/t/test_cmd_windowmap.rb
@@ -3,7 +3,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandWindowMapTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_windowminimize.rb
+++ b/t/test_cmd_windowminimize.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandWindowMinimizeTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_windowmove.rb
+++ b/t/test_cmd_windowmove.rb
@@ -3,7 +3,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandWindowMoveTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_cmd_windowsize.rb
+++ b/t/test_cmd_windowsize.rb
@@ -3,7 +3,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolCommandWindowSizeTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_mousemove.rb
+++ b/t/test_mousemove.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolMouseMoveTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_script.rb
+++ b/t/test_script.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 require "tempfile"
 
 class XdotoolScriptTests < Test::Unit::TestCase
--- a/t/test_search.rb
+++ b/t/test_search.rb
@@ -2,7 +2,7 @@
 #
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolSearchTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_typing.rb
+++ b/t/test_typing.rb
@@ -3,7 +3,7 @@
 
 require "test/unit"
 require "tempfile"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolTypingTests < Test::Unit::TestCase
   include XdoTestHelper
--- a/t/test_window.rb
+++ b/t/test_window.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "test/unit"
-require "xdo_test_helper"
+require_relative "xdo_test_helper"
 
 class XdotoolWindowTests < Test::Unit::TestCase
   include XdoTestHelper

Attachment: signature.asc
Description: Digital signature

Reply via email to