[pbuilder] 01/03: t/satisfydepends-funcs: move the inlined dsc into t/data/dsc1

Mattia Rizzolo mattia at debian.org
Sat Jul 23 09:45:35 UTC 2016


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

mattia pushed a commit to branch master
in repository pbuilder.

commit f638bc4c3cd2d5b65fd103bce013fe4117299cbe
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Jul 23 09:11:29 2016 +0000

    t/satisfydepends-funcs: move the inlined dsc into t/data/dsc1
---
 t/data/dsc1                          | 37 ++++++++++++++++++++++++++++++++++++
 t/test_pbuilder-satisfydepends-funcs | 31 ++----------------------------
 t/testlib.sh                         |  2 ++
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/t/data/dsc1 b/t/data/dsc1
new file mode 100644
index 0000000..8fc9f99
--- /dev/null
+++ b/t/data/dsc1
@@ -0,0 +1,37 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+Format: 3.0 (quilt)
+Source: haskell-concrete-typerep
+Binary: libghc-concrete-typerep-dev, libghc-concrete-typerep-prof, libghc-concrete-typerep-doc
+Architecture: any all
+Version: 0.1.0.2-2
+Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
+Uploaders: Masayuki Hatta (mhatta) <mhatta at debian.org>
+Homepage: http://hackage.haskell.org/package/concrete-typerep
+Standards-Version: 3.9.3
+Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-concrete-typerep
+Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/haskell-concrete-typerep
+Build-Depends: debhelper (>= 9), haskell-devscripts (>= 0.8.15), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3)
+Build-Depends-Indep: ghc-doc, libghc-hashable-doc (<< 1.3)
+Package-List: 
+ libghc-concrete-typerep-dev deb haskell extra
+ libghc-concrete-typerep-doc deb doc extra
+ libghc-concrete-typerep-prof deb haskell extra
+Checksums-Sha1: 
+ 7dc356eef28c83f606b792e3d39b68a04c1a6d98 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
+ 10710e36d3e55272169c8600f1dd558fe2102217 2232 haskell-concrete-typerep_0.1.0.2-2.debian.tar.gz
+Checksums-Sha256: 
+ f72a41d9d8315528c7b0e13bf61e6122c7d236cb529c207cfb431cf272439e1f 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
+ 34f25f113fd7762ffc783cb9f2942e78bd10546826c76e76ad30d89a9ede9471 2232 haskell-concrete-typerep_0.1.0.2-2.debian.tar.gz
+Files: 
+ 5638a296661fb65145dfbc062cfa53db 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
+ cb67a46d6b00af4fc5769c11ae6c99f8 2232 haskell-concrete-typerep_0.1.0.2-2.debian.tar.gz
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEARECAAYFAlGgkLEACgkQ9ijrk0dDIGyOhgCfd5PqA5Uy3l26+sfU0PfnxRX5
+Do4AnRDBnUTngXlbdIx1NpsgUsLluc1U
+=qQyP
+-----END PGP SIGNATURE-----
diff --git a/t/test_pbuilder-satisfydepends-funcs b/t/test_pbuilder-satisfydepends-funcs
index 1bdd31a..12cf8d7 100755
--- a/t/test_pbuilder-satisfydepends-funcs
+++ b/t/test_pbuilder-satisfydepends-funcs
@@ -76,34 +76,7 @@ test_get_parsed_build_deps_dsc() {
     local ARCH="amd64"
     local BINARY_ARCH="any"
 
-    cat > "$DEBIAN_CONTROL" << EOF
-Format: 3.0 (quilt)
-Source: haskell-concrete-typerep
-Binary: libghc-concrete-typerep-dev, libghc-concrete-typerep-prof, libghc-concrete-typerep-doc
-Architecture: any all
-Version: 0.1.0.2-4
-Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Masayuki Hatta (mhatta) <mhatta at debian.org>
-Homepage: http://hackage.haskell.org/package/concrete-typerep
-Standards-Version: 3.9.3
-Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-concrete-typerep
-Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-concrete-typerep
-Build-Depends: debhelper (>= 9), haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3)
-Build-Depends-Indep: ghc-doc, libghc-hashable-doc (<< 1.3)
-Package-List:
- libghc-concrete-typerep-dev deb haskell extra arch=any
- libghc-concrete-typerep-doc deb doc extra arch=all
- libghc-concrete-typerep-prof deb haskell extra arch=any
-Checksums-Sha1:
- 7dc356eef28c83f606b792e3d39b68a04c1a6d98 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
- a5b34d7dd7f1ef42b0afad86140efcd6997d09c1 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz
-Checksums-Sha256:
- f72a41d9d8315528c7b0e13bf61e6122c7d236cb529c207cfb431cf272439e1f 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
- 09dcedfef76799dcb3c6a9e22bc22711050cc56769614bdbf61b426579ce10e5 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz
-Files:
- 5638a296661fb65145dfbc062cfa53db 3159 haskell-concrete-typerep_0.1.0.2.orig.tar.gz
- 706754d44fac13c25e1ee8dd89180c53 2272 haskell-concrete-typerep_0.1.0.2-4.debian.tar.xz
-EOF
+    cat "$TESTDATA_DIR/dsc1" > "$DEBIAN_CONTROL"
     get_build_deps | filter_arch_deps "$ARCH" | filter_restriction_deps "$DEB_BUILD_PROFILES"
 }
 
@@ -200,7 +173,7 @@ expect_output "foo" test_filter_arch_restriction_deps "foo [amd64] <!stage1>" "a
 expect_output "" test_filter_arch_restriction_deps "foo [i386] <stage1>" "amd64" "stage1"
 
 expect_output "debhelper (>= 7)" test_get_build_deps_dsc
-expect_output "debhelper (>= 9), haskell-devscripts (>= 0.9), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3), ghc-doc, libghc-hashable-doc (<< 1.3)" test_get_parsed_build_deps_dsc
+expect_output "debhelper (>= 9), haskell-devscripts (>= 0.8.15), cdbs, ghc, ghc-prof, libghc-hashable-dev (<< 1.3), libghc-hashable-prof (<< 1.3), ghc-doc, libghc-hashable-doc (<< 1.3)" test_get_parsed_build_deps_dsc
 
 expect_output "something-funny" test_get_source_control_field_with_comments
 
diff --git a/t/testlib.sh b/t/testlib.sh
index 05cdfdc..c40f0be 100644
--- a/t/testlib.sh
+++ b/t/testlib.sh
@@ -27,6 +27,8 @@ fi
 
 # set PBUILDER_TEST_VERBOSE to get the full output of tests
 
+TESTDATA_DIR="${BASH_SOURCE%/*}/data"
+
 TESTLIB_FAILS=0
 TESTLIB_TESTS=0
 

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



More information about the Pbuilder-maint mailing list