[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. apt-listbugs/0.1.5-4-g7b220a8

[Francesco Poli (wintermute)]

The following commit has been merged in the master branch:
commit b033c1c4ea592d0de1029fdc3e37a363df7cd223
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Sat Oct 15 19:11:42 2011 +0200

    move first test suite into make check
    
    The first test suite (test_logic.rb) is now in the "check" Makefile
    target, so that it gets automatically executed by dh_auto_test.
    Unfortunately, this means that more build-dependencies are needed...
    The secord test suite (tests/*) is currently outdated: it is disabled
    for the time being (maybe it should be re-implemented by using
    autopkgtest, see http://dep.debian.net/deps/dep8/; this may be done
    in the future...).

diff --git a/Makefile b/Makefile
index 8d40963..c8f7205 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-# bashisms in real-check
-SHELL = /bin/bash
-
 LINGUAS := $(shell cd po; ls *.po| cut -d'.' -f1)
 MOFILES := $(patsubst %.po,%.mo,$(wildcard po/*.po))
 
@@ -12,11 +9,8 @@ clean:
 	rm -f apt-listbugs.1
 	rm -f $(MOFILES)
 
-real-check:
-	: > tests/log/SUMMARY 
-	set -e; set -o pipefail; for A in test_*.rb; do echo $$A; ( ./$$A  2>&1 | tee tests/log/$${A/*\//}.log ) && echo "[OK] $$A" >> tests/log/SUMMARY || echo "[NG] $$A" >> tests/log/SUMMARY ; done
-	set -e; set -o pipefail; for A in tests/???_*.sh; do echo $$A; ( bash $$A  2>&1 | tee tests/log/$${A/*\//}.log ) && echo "[OK] $$A" >> tests/log/SUMMARY || echo "[NG] $$A" >> tests/log/SUMMARY ; done
-	cat tests/log/SUMMARY
+check:
+	./test_logic.rb
 
 apt-listbugs.1: apt-listbugs
 	rd2 -r rd/rd2man-lib.rb -o apt-listbugs apt-listbugs
diff --git a/debian/changelog b/debian/changelog
index d425290..14e9c91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ apt-listbugs (0.1.6) UNRELEASED; urgency=low
     supports ruby1.9.x
   * fixed "Depends on a few of transitional packages", trying to be as
     backport-friendly as possible (Closes: #639972)
+  * moved the first test suite to Make check target, disabled the second
+    test suite (which is outdated), changed build-dependencies accordingly
 
- -- Francesco Poli (wintermute) <invernomuto at paranoici.org>  Sun, 04 Sep 2011 17:18:04 +0200
+ -- Francesco Poli (wintermute) <invernomuto at paranoici.org>  Sat, 15 Oct 2011 00:34:21 +0200
 
 apt-listbugs (0.1.5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1a52397..07c123f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Francesco Poli (wintermute) <invernomuto at paranoici.org>
 Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>
 Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: ruby1.8, rdtool, gettext, time
+Build-Depends-Indep: ruby1.8, rdtool, gettext, libdpkg-ruby1.8 (>= 0.3.3), libgettext-ruby1.8 (>= 2.1.0)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/apt-listbugs/apt-listbugs.git
 Vcs-Browser: http://git.debian.org/?p=apt-listbugs/apt-listbugs.git
diff --git a/debian/pbuilder-test/01_apt-listbugs-list b/debian/pbuilder-test/01_apt-listbugs-list
deleted file mode 100644
index 423ba12..0000000
--- a/debian/pbuilder-test/01_apt-listbugs-list
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# run apt-listbugs testsuite here.
-apt-get install --force-yes -y time
-
-make real-check
diff --git a/tests/log/SUMMARY b/tests/log/SUMMARY
deleted file mode 100644
index 1d63ed8..0000000
--- a/tests/log/SUMMARY
+++ /dev/null
@@ -1,12 +0,0 @@
-[OK] test_logic.rb
-[OK] tests/001_list.sh
-[OK] tests/002_nobugs.sh
-[OK] tests/003_apt-listbugs-apt.sh
-[OK] tests/004_apt-listbugs-full.sh
-[OK] tests/005_example-bug-soap.sh
-[OK] tests/006_example-deblistbugs.sh
-[OK] tests/007_example-rc2rss.sh
-[OK] tests/008_test_proxy.sh
-[OK] tests/009_-H.sh
-[OK] tests/010_example-getbugs.sh
-[OK] tests/011_example_severity-and-pkgname-to-bugtitle.sh
diff --git a/tests/log/test_logic.rb.log b/tests/log/test_logic.rb.log
deleted file mode 100644
index 23eb833..0000000
--- a/tests/log/test_logic.rb.log
+++ /dev/null
@@ -1,6 +0,0 @@
-Loaded suite ./test_logic
-Started
-......
-Finished in 1.393513 seconds.
-
-6 tests, 41 assertions, 0 failures, 0 errors

-- 
apt-listbugs development tree