[DRE-commits] [rabbit] 03/04: use d/tests/run-test instead of d/ruby-tests.rb

[Daisuke Higuchi]

This is an automated email from the git hooks/post-receive script.

dai pushed a commit to branch master
in repository rabbit.

commit 0bc3af219799e6cf82934c1faf9509ee1ab97224
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sun Aug 6 22:19:22 2017 +0900

    use d/tests/run-test instead of d/ruby-tests.rb
---
 debian/ruby-tests.rb  | 1 -
 debian/tests/control  | 5 +++--
 debian/tests/run-test | 7 +++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
deleted file mode 100644
index e16649e..0000000
--- a/debian/ruby-tests.rb
+++ /dev/null
@@ -1 +0,0 @@
-system("xvfb-run --auto-servernum --server-num=0 #{ENV['RUBY_TEST_BIN']} -Idebian/rabbit/usr/lib:test test/run-test.rb") or raise
diff --git a/debian/tests/control b/debian/tests/control
index 0b1cc5e..7d839d7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,4 @@
-Test-Command: gem2deb-test-runner --check-dependencies --autopkgtest 2>&1
-Depends: @, gem2deb-test-runner, rttool, xvfb, xauth,
+Tests: run-test
+Depends: @, gem2deb-test-runner, rttool, quilt, xvfb, xauth,
   ruby-test-unit-rr, ruby-test-unit-notify, python-blockdiag
+Restrictions: allow-stderr
diff --git a/debian/tests/run-test b/debian/tests/run-test
new file mode 100644
index 0000000..0af1d66
--- /dev/null
+++ b/debian/tests/run-test
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+QUILT_PATCHES=debian/patches quilt push -a || true
+xvfb-run --auto-servernum --server-num=0 ruby -Idebian/rabbit/usr/lib:test test/run-test.rb
+QUILT_PATCHES=debian/patches quilt pop -a || true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rabbit.git