[DRE-commits] [ruby-mysql] 06/08: fix test suite

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-mysql.

commit 72b542cf2c0634683fb748204837ecbf94b77d8f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Oct 6 08:01:24 2014 -0300

    fix test suite
---
 debian/control                                         |  5 +++--
 .../patches/add-basic-encoding-awareness-logic.patch   | 18 ++++++++++++++++++
 debian/ruby-test-files.yaml                            |  4 ++--
 debian/rules                                           | 16 ++++++----------
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index 76bb704..6f650cd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Borodaenko <angdraug at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), libmysqlclient-dev
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-test-unit, libmysqlclient-dev
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-mysql.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-mysql.git;a=summary
 Homepage: http://www.tmtm.org/en/mysql/
 XS-Ruby-Versions: all
+Testsuite: autopkgtest-pkg-ruby
 
 Package: ruby-mysql
 Architecture: any
diff --git a/debian/patches/add-basic-encoding-awareness-logic.patch b/debian/patches/add-basic-encoding-awareness-logic.patch
index 41b7287..3850f1e 100644
--- a/debian/patches/add-basic-encoding-awareness-logic.patch
+++ b/debian/patches/add-basic-encoding-awareness-logic.patch
@@ -236,6 +236,24 @@ Last-Update: 2012-08-05
  /*-------------------------------
 --- a/test/test_mysql.rb
 +++ b/test/test_mysql.rb
+@@ -342,7 +342,7 @@ class TC_MysqlRes < Test::Unit::TestCase
+     assert_equal("t", f.table)
+     assert_equal(nil, f.def)
+     assert_equal(Mysql::Field::TYPE_STRING, f.type)
+-    assert_equal(30, f.length)
++    assert_equal(10, f.length)
+     assert_equal(4, f.max_length)
+     assert_equal(0, f.flags)
+     assert_equal(0, f.decimals)
+@@ -399,7 +399,7 @@ class TC_MysqlRes < Test::Unit::TestCase
+       "table" => "t",
+       "def" => nil,
+       "type" => Mysql::Field::TYPE_STRING,
+-      "length" => 30,
++      "length" => 10,
+       "max_length" => 4,
+       "flags" => 0,
+       "decimals" => 0,
 @@ -1234,7 +1234,9 @@ class TC_MysqlStmt2 < Test::Unit::TestCa
        @s.execute
        assert_equal([nil], @s.fetch)
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
index 49206f0..f0adab5 100644
--- a/debian/ruby-test-files.yaml
+++ b/debian/ruby-test-files.yaml
@@ -1,2 +1,2 @@
---- 
-[]
+---
+- test/test_mysql.rb
diff --git a/debian/rules b/debian/rules
index 3b35bc1..be1b9bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,11 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-#
-# Uncomment to ignore all test failures (but the tests will run anyway)
-#export DH_RUBY_IGNORE_TESTS=all
-#
-# Uncomment to ignore some test failures (but the tests will run anyway).
-# Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
-#
-# If you need to specify the .gemspec (eg there is more than one)
-export DH_RUBY_GEMSPEC=debian/mysql-2.8.2.gemspec
+
+export LANG=C.UTF-8
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_clean:
+	dh_auto_clean
+	$(RM) ext/mysql_api/error_const.h

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