This is needed in order to run the ruby tests out-of-tree.  But it
apparently breaks some assumptions in a few of the tests.  This message
is just a heads-up, I'll try to fix this myself later this evening, but
if someone wants to beat me to it, even better. (:
[[[
Fix 'make check-swig-rb' invocation for an out-of-tree build.
* subversion/bindings/swig/ruby/test/run-test.rb
  (base_dir): Set to current directory.
  (base_src_dir): New name for the old base_dir.  Add it to LOAD_PATH.
Patch by: Peter Samuelson <peter_at_p12n.org>
]]]
--- a/subversion/bindings/swig/ruby/test/run-test.rb
+++ b/subversion/bindings/swig/ruby/test/run-test.rb
@@ -4,7 +4,8 @@
 require "fileutils"
 
 test_dir = File.expand_path(File.join(File.dirname(__FILE__)))
-base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+base_src_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+base_dir = Dir.pwd
 top_dir = File.expand_path(File.join(base_dir, "..", "..", "..", ".."))
 
 ext_dir = File.join(base_dir, ".ext")
@@ -20,6 +21,7 @@
 SvnTestUtil.setup_test_environment(top_dir, base_dir, ext_svn_ext_dir)
 
 $LOAD_PATH.unshift(ext_dir)
+$LOAD_PATH.unshift(base_src_dir)
 $LOAD_PATH.unshift(base_dir)
 $LOAD_PATH.unshift(test_dir)
 
{BUILD_DIR} $ make check-swig-rb
cd {BUILD_DIR}/subversion/bindings/swig/ruby; \
          /usr/bin/ruby1.8 -I {SRC_DIR}/subversion/bindings/swig/ruby \
            {SRC_DIR}/subversion/bindings/swig/ruby/test/run-test.rb \
            --verbose=normal
Loaded suite .
Started
...............F........................FFFFF.......................................................................................................................................................................
Finished in 483.637445 seconds.
  1) Failure:
test_copy(SvnClientTest) [{SRC_DIR}/subversion/bindings/swig/ruby/test/test_client.rb:1170]:
<["../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt"]> expected but was
<["subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt"]>.
  2) Failure:
test_mkdir_multiple(SvnClientTest) [{SRC_DIR}/subversion/bindings/swig/ruby/test/test_client.rb:175]:
<["../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/dir",
 "../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/dir2"]> expected but was
<["subversion/bindings/swig/ruby/test/wc-tmp/wc/dir",
 "subversion/bindings/swig/ruby/test/wc-tmp/wc/dir2"]>.
  3) Failure:
test_mkdir_multiple2(SvnClientTest) [{SRC_DIR}/subversion/bindings/swig/ruby/test/test_client.rb:210]:
<["../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/dir",
 "../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/dir2"]> expected but was
<["subversion/bindings/swig/ruby/test/wc-tmp/wc/dir",
 "subversion/bindings/swig/ruby/test/wc-tmp/wc/dir2"]>.
  4) Failure:
test_mkdir_p(SvnClientTest) [{SRC_DIR}/subversion/bindings/swig/ruby/test/test_client.rb:241]:
<["../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/parent",
 "../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/parent/child"]> expected but was
<["subversion/bindings/swig/ruby/test/wc-tmp/wc/parent",
 "subversion/bindings/swig/ruby/test/wc-tmp/wc/parent/child"]>.
  5) Failure:
test_move(SvnClientTest) [{SRC_DIR}/subversion/bindings/swig/ruby/test/test_client.rb:1200]:
<["../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/sample1.txt",
 "../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt"]> expected but was
<["subversion/bindings/swig/ruby/test/wc-tmp/wc/sample1.txt",
 "subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt"]>.
  6) Failure:
test_move_force(SvnClientTest) [{SRC_DIR}/subversion/bindings/swig/ruby/test/test_client.rb:1244]:
<["../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/sample1.txt",
 "../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt",
 "../../../../../subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt"]> expected but was
<["subversion/bindings/swig/ruby/test/wc-tmp/wc/sample1.txt",
 "subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt",
 "subversion/bindings/swig/ruby/test/wc-tmp/wc/sample2.txt"]>.
212 tests, 1428 assertions, 6 failures, 0 errors
make: *** [check-swig-rb] Error 1
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-20 22:18:12 CEST