[DRE-commits] [SCM] racc.git branch, master, updated. upstream/1.4.8-15-g99ed53e

[Taku YASUI]

The following commit has been merged in the master branch:
commit 99ed53e974d8e2369c2c69c72852cdd8ac4ab732
Author: Taku YASUI <tach at debian.org>
Date:   Tue May 8 23:52:26 2012 +0900

    Fix to change test log path

diff --git a/debian/changelog b/debian/changelog
index 3e86502..93e6930 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ racc (1.4.8-1) unstable; urgency=low
   * Build HTML document using rdtool.
   * Fix test failed by test helper
     - debian/patches/020_test_helper_ruby_path_fix
+  * Fix test output log path to test dir
+    - debian/patches/030_move_test_log
 
  -- Taku YASUI <tach at debian.org>  Tue, 08 May 2012 20:13:41 +0900
 
diff --git a/debian/patches/020_test_helper_ruby_path_fix b/debian/patches/030_move_test_log
similarity index 50%
copy from debian/patches/020_test_helper_ruby_path_fix
copy to debian/patches/030_move_test_log
index d131612..78fce95 100644
--- a/debian/patches/020_test_helper_ruby_path_fix
+++ b/debian/patches/030_move_test_log
@@ -1,12 +1,11 @@
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -79,7 +79,8 @@
-     
+@@ -80,7 +80,7 @@
      def ruby arg
        Dir.chdir(TEST_DIR) do
--        cmd = "#{ENV['_']} -I #{INC} #{arg} 2>>/tmp/out"
-+        cmd = File.symlink?("/proc/#{$$}/exe") ? File.readlink("/proc/#{$$}/exe") : ENV['_']
-+        cmd = "#{cmd} -I #{INC} #{arg} 2>>/tmp/out"
+         cmd = File.symlink?("/proc/#{$$}/exe") ? File.readlink("/proc/#{$$}/exe") : ENV['_']
+-        cmd = "#{cmd} -I #{INC} #{arg} 2>>/tmp/out"
++        cmd = "#{cmd} -I #{INC} #{arg} 2>>#{TEST_DIR}/out.log"
          result = system(cmd)
          result ? assert(result) : raise(cmd)
        end
diff --git a/debian/patches/series b/debian/patches/series
index 16c9cc0..b297d1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 010_disable_ext
 020_test_helper_ruby_path_fix
+030_move_test_log
diff --git a/debian/rules b/debian/rules
index 8ab7c5a..e684bac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,4 +25,5 @@ override_dh_install: $(docs_html)
 
 override_dh_clean:
 	rm -f $(rdocs_html)
+	rm -f test/out.log
 	dh_clean

-- 
racc.git