diff options
| author | Loïc Minier <lool@dooz.org> | 2010-01-04 16:49:59 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2010-01-04 16:52:34 +0100 |
| commit | f798994af1d760954fb6e8d0be0d17e60862e479 (patch) | |
| tree | ccd95e44a6e805111730378debc249f2a3d9c783 /test_pbuilder-satisfydepends-funcs | |
| parent | 35a94e9d9dc8d73d071c65e54e4f68353df0aa7e (diff) | |
| download | pbuilder-f798994af1d760954fb6e8d0be0d17e60862e479.tar pbuilder-f798994af1d760954fb6e8d0be0d17e60862e479.tar.gz | |
Simpler logic for inclusion of -Indep build-deps
Set BINARY_ARCH in pbuilder-satisfydepends-checkparams just as in
pbuilder-checkparams instead of setting BC_REGEXP and BD_REGEXP and
change get_build_deps and get_build_conflicts to query for Build-Deps /
Build-Conflicts only, with an optional separate get_control_re call for
the -Indep deps if needed. Update testsuite to also test for
build-deps-indep.
Diffstat (limited to 'test_pbuilder-satisfydepends-funcs')
| -rwxr-xr-x | test_pbuilder-satisfydepends-funcs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test_pbuilder-satisfydepends-funcs b/test_pbuilder-satisfydepends-funcs index 5512bd6..9ce38c7 100755 --- a/test_pbuilder-satisfydepends-funcs +++ b/test_pbuilder-satisfydepends-funcs @@ -6,7 +6,6 @@ # testsuite to test pbuilder-satisfydepends-funcs. DEBIAN_CONTROL="" -BD_REGEXP="build-(depends|depends-indep)" cleanup() { if [ -n "$DEBIAN_CONTROL" ]; then @@ -15,6 +14,10 @@ cleanup() { } test_get_build_deps() { + local BINARY_ARCH + + BINARY_ARCH="$1" + cat <<EOF >"$DEBIAN_CONTROL" Source: amule XXXX: @@ -43,6 +46,9 @@ trap cleanup sigpipe sighup exit DEBIAN_CONTROL="$(tempfile)" expect_output " autotools-dev, debhelper, quilt, libwxgtk2.8-dev - test, test1, test2, test3 | test4, test5" test_get_build_deps + test, test1, test2, test3 | test4, test5" \ + test_get_build_deps "no" +expect_output " autotools-dev, debhelper, quilt, libwxgtk2.8-dev" \ + test_get_build_deps "yes" testlib_summary |