[SCM] Git repository for devscripts branch, master, updated. v2.12.4-57-g721b08a
Benjamin Drung
bdrung at debian.org
Tue Oct 30 21:03:57 UTC 2012
The following commit has been merged in the master branch:
commit 721b08a65f967e7a1265bd8cdf9d169b1462d00c
Author: Benjamin Drung <bdrung at debian.org>
Date: Tue Oct 30 21:58:50 2012 +0100
Add autopkgtest support.
diff --git a/debian/control b/debian/control
index 0c555a3..c76b155 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Build-Depends: debhelper (>= 8),
shunit2 (>= 2.1.6),
xsltproc
X-Python-Version: >= 2.6
+XS-Testsuite: autopkgtest
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=devscripts/devscripts.git
Vcs-Git: git://anonscm.debian.org/devscripts/devscripts.git
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..826ff69
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: shunit2
+Depends: devscripts
diff --git a/debian/tests/shunit2 b/debian/tests/shunit2
new file mode 100755
index 0000000..b5ef7c3
--- /dev/null
+++ b/debian/tests/shunit2
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+test/test_checkbashisms --installed
+test/test_dd-list --installed
+test/test_debchange --installed
+test/test_licensecheck --installed
diff --git a/test/test_checkbashisms b/test/test_checkbashisms
index fda4c48..15edb88 100755
--- a/test/test_checkbashisms
+++ b/test/test_checkbashisms
@@ -14,7 +14,13 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-COMMAND="../scripts/checkbashisms.pl"
+if test "$1" = --installed; then
+ COMMAND=checkbashisms
+ shift
+else
+ COMMAND="../scripts/checkbashisms.pl"
+fi
+
WORKDIR="$(readlink -f "${0%/*}")"
. "${0%/*}/shunit2-helper-functions.sh"
diff --git a/test/test_dd-list b/test/test_dd-list
index 0c70d47..e9619ac 100755
--- a/test/test_dd-list
+++ b/test/test_dd-list
@@ -15,10 +15,17 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-COMMAND="../scripts/dd-list.pl"
+if test "$1" = --installed; then
+ COMMAND=dd-list
+ shift
+else
+ COMMAND="../scripts/dd-list.pl"
+fi
+
+WORKDIR="$(readlink -f "${0%/*}")"
testBinariesFromSameSource() {
- $COMMAND -s dd-list/sources vim-gtk vim-nox 2>&1 >/dev/null
+ $COMMAND -s ${WORKDIR}/dd-list/sources vim-gtk vim-nox 2>&1 >/dev/null
rc=$?
assertEquals 'packages found' 0 $rc
}
diff --git a/test/test_debchange b/test/test_debchange
index a452a78..d7d7095 100755
--- a/test/test_debchange
+++ b/test/test_debchange
@@ -14,7 +14,12 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-COMMAND="perl -I ${0%/*}/.. ${0%/*}/../scripts/debchange.pl"
+if test "$1" = --installed; then
+ COMMAND=dch
+ shift
+else
+ COMMAND="perl -I ${0%/*}/.. ${0%/*}/../scripts/debchange.pl"
+fi
. "${0%/*}/shunit2-helper-functions.sh"
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 027f3b2..fda7e79 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -14,7 +14,13 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-COMMAND="../scripts/licensecheck.pl"
+if test "$1" = --installed; then
+ COMMAND=licensecheck
+ shift
+else
+ COMMAND="../scripts/licensecheck.pl"
+fi
+
WORKDIR="$(readlink -f "${0%/*}")"
. "${0%/*}/shunit2-helper-functions.sh"
--
Git repository for devscripts
More information about the devscripts-devel
mailing list