[pbuilder] 01/02: t: DRY

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository pbuilder.

commit d83fda91af8d2f19ebc8e1bbfb26fc6fc93db0c2
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Dec 31 15:25:36 2016 +0100

    t: DRY
    
    Gbp-Dch: Ignore
---
 t/test_pbuilder-apt-config                 | 3 +--
 t/test_pbuilder-buildpackage-funcs         | 3 +--
 t/test_pbuilder-checkparams                | 3 +--
 t/test_pbuilder-modules                    | 3 +--
 t/test_pbuilder-satisfydepends-checkparams | 3 +--
 t/test_pbuilder-satisfydepends-classic     | 3 +--
 t/test_pbuilder-satisfydepends-funcs       | 3 +--
 t/test_testlib.sh                          | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/t/test_pbuilder-apt-config b/t/test_pbuilder-apt-config
index daaa506..359c6f0 100755
--- a/t/test_pbuilder-apt-config
+++ b/t/test_pbuilder-apt-config
@@ -7,11 +7,10 @@ self="$(basename "$0")"
 recent_enough_ubuntu=xenial
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     PBUILDER_APT_CONFIG="$PBUILDER_CHECKOUT/pbuilder-apt-config"
 else
-    . "$TD/testlib.sh"
     PBUILDER_APT_CONFIG="$PBUILDER_TEST_PKGLIBDIR/pbuilder-apt-config"
 fi
 
diff --git a/t/test_pbuilder-buildpackage-funcs b/t/test_pbuilder-buildpackage-funcs
index 9e0a50e..1160a10 100755
--- a/t/test_pbuilder-buildpackage-funcs
+++ b/t/test_pbuilder-buildpackage-funcs
@@ -24,11 +24,10 @@
 # testsuite to test pbuilder-satisfydepends-funcs.
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     . "$PBUILDER_CHECKOUT/pbuilder-buildpackage-funcs"
 else
-    . "$TD/testlib.sh"
     . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-buildpackage-funcs"
 fi
 
diff --git a/t/test_pbuilder-checkparams b/t/test_pbuilder-checkparams
index a81ae8d..0793042 100755
--- a/t/test_pbuilder-checkparams
+++ b/t/test_pbuilder-checkparams
@@ -3,11 +3,10 @@
 # testsuite for pbuilder-checkparams
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     PBUILDER_CHECKPARAMS="$PBUILDER_CHECKOUT/pbuilder-checkparams"
 else
-    . "$TD/testlib.sh"
     PBUILDER_CHECKPARAMS="$PBUILDER_TEST_PKGLIBDIR/pbuilder-checkparams"
 fi
 
diff --git a/t/test_pbuilder-modules b/t/test_pbuilder-modules
index 18b6e74..8f4eaf7 100755
--- a/t/test_pbuilder-modules
+++ b/t/test_pbuilder-modules
@@ -3,11 +3,10 @@
 TD="$(dirname "$0")"
 LOGLEVEL=I
 USECOLORS=no
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     . "$PBUILDER_CHECKOUT/pbuilder-modules"
 else
-    . "$TD/testlib.sh"
     . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-modules"
 fi
 
diff --git a/t/test_pbuilder-satisfydepends-checkparams b/t/test_pbuilder-satisfydepends-checkparams
index ccb044d..b44eda0 100755
--- a/t/test_pbuilder-satisfydepends-checkparams
+++ b/t/test_pbuilder-satisfydepends-checkparams
@@ -1,11 +1,10 @@
 #!/bin/bash
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     PBUILDER_SATISFYDEPENDS_CHECKPARAMS="$PBUILDER_CHECKOUT/pbuilder-satisfydepends-checkparams"
 else
-    . "$TD/testlib.sh"
     PBUILDER_SATISFYDEPENDS_CHECKPARAMS="$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-checkparams"
 fi
 
diff --git a/t/test_pbuilder-satisfydepends-classic b/t/test_pbuilder-satisfydepends-classic
index 929699b..619ebb1 100755
--- a/t/test_pbuilder-satisfydepends-classic
+++ b/t/test_pbuilder-satisfydepends-classic
@@ -4,11 +4,10 @@
 #done
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     PBUILDER_SATISFYDEPENDS_CLASSIC="$PBUILDER_CHECKOUT/pbuilder-satisfydepends-classic"
 else
-    . "$TD/testlib.sh"
     PBUILDER_SATISFYDEPENDS_CLASSIC="$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-classic"
 fi
 
diff --git a/t/test_pbuilder-satisfydepends-funcs b/t/test_pbuilder-satisfydepends-funcs
index 142bcf9..cced2d1 100755
--- a/t/test_pbuilder-satisfydepends-funcs
+++ b/t/test_pbuilder-satisfydepends-funcs
@@ -3,11 +3,10 @@
 # testsuite to test pbuilder-satisfydepends-funcs.
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     . "$PBUILDER_CHECKOUT/pbuilder-satisfydepends-funcs"
 else
-    . "$TD/testlib.sh"
     . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-satisfydepends-funcs"
 fi
 
diff --git a/t/test_testlib.sh b/t/test_testlib.sh
index a37f6b1..0fdab6d 100755
--- a/t/test_testlib.sh
+++ b/t/test_testlib.sh
@@ -2,11 +2,10 @@
 # testsuite for testlib
 
 TD="$(dirname "$0")"
+. "$TD/testlib.sh"
 if [ -n "$PBUILDER_CHECKOUT" ]; then
-    . "$TD/testlib.sh"
     . "$PBUILDER_CHECKOUT/pbuilder-modules"
 else
-    . "$TD/testlib.sh"
     . "$PBUILDER_TEST_PKGLIBDIR/pbuilder-modules"
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git