[DRE-commits] [SCM] ruby-haml.git branch, master, updated. debian/3.1.4-2-13-g96b4553

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit eba3969fe4b0b308455c819f19877f857427de57
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sun Jun 24 17:23:12 2012 +0200

    Use the upstream Rakefile to run tests and supply a symlink to Rails to make it runnable

diff --git a/debian/changelog b/debian/changelog
index 5632318..03a953f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ruby-haml (3.1.6-1) UNRELEASED; urgency=low
     - Bumped the build-depend on ruby-haml to 0.3.0.
   * debian/patches:
     - Added remove_require_rubygems.patch.
+  * debian/rules, debian/ruby-test*: use the upstream Rakefile to run
+    the tests and supply a symlink to rails to make them runable.
 
  -- Paul van Tilburg <paulvt at debian.org>  Sun, 24 Jun 2012 16:28:09 +0200
 
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index 167869a..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
---- 
-- test/haml/engine_test.rb
-- test/haml/html2haml_test.rb
-- test/haml/template_test.rb
-- test/haml/util_test.rb
-- test/haml/helper_test.rb
-- test/haml/spec_test.rb
-- test/haml/spec/ruby_haml_test.rb
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 120000
index 0000000..c6de17e
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1 @@
+../Rakefile
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 967b63e..236c5b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 #export DH_VERBOSE=1
 #
 # Uncomment to ignore all test failures (but the tests will run anyway)
-export DH_RUBY_IGNORE_TESTS=all
+#export DH_RUBY_IGNORE_TESTS=all
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
@@ -24,6 +24,12 @@ override_dh_auto_install:
 	rm debian/ruby-haml/usr/lib/ruby/vendor_ruby/sass.rb
 	rm debian/ruby-haml/usr/lib/ruby/vendor_ruby/sass/plugin.rb
 
+override_dh_auto_test:
+	dh_auto_test
+	# Link rails so the tests can be executed.
+	ln -s /usr/lib/ruby/vendor_ruby/rails test/rails
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf .yardoc yardoc
+	rm -f test/rails

-- 
ruby-haml.git