Przeglądaj źródła

tests: apt build-dep actually reports no depends correctly

'Regression' of 7d19ee92f2368a40e739cb27d22d6d28f37ebf45, just that it
now works more as expected than previously. Of course, build-essentials
are implicitly also build dependencies, so by definition all packages
have build dependencies, but that isn't what this message wants to say
and it isn't what the user expects.

Git-Dch: Ignore
David Kalnischkies 10 lat temu
rodzic
commit
39f96d07cf

+ 2 - 0
test/integration/test-architecture-specification-parsing

@@ -80,6 +80,7 @@ Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s
 
 
 testsuccessequal 'Reading package lists...
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Building dependency tree...
+pkg-arch-no-foo has no build depends.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
 
 
 testsuccessequal "Reading package lists...
 testsuccessequal "Reading package lists...
@@ -100,6 +101,7 @@ Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -
 
 
 testsuccessequal 'Reading package lists...
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 Building dependency tree...
+no-depends has no build depends.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s
 
 
 # this is not really testing APT - more that dpkg is in line with us
 # this is not really testing APT - more that dpkg is in line with us

+ 12 - 2
test/integration/test-bug-661537-build-profiles-support

@@ -65,9 +65,12 @@ The following NEW packages will be installed:
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
 Inst foo (1.0 unstable [all])
 Inst foo (1.0 unstable [all])
 Conf foo (1.0 unstable [all])'
 Conf foo (1.0 unstable [all])'
-DROP='Reading package lists...
+setdrop() {
+	DROP="Reading package lists...
 Building dependency tree...
 Building dependency tree...
-0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.'
+$1 has no build depends.
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded."
+}
 
 
 msgtest 'Check if version of installed dpkg is high enough for' 'build profiles support'
 msgtest 'Check if version of installed dpkg is high enough for' 'build profiles support'
 if dpkg --compare-versions "$(command dpkg-query --showformat='${Version}' --show dpkg)" 'ge' '1.17.14'; then
 if dpkg --compare-versions "$(command dpkg-query --showformat='${Version}' --show dpkg)" 'ge' '1.17.14'; then
@@ -111,36 +114,43 @@ testprofile() {
 	testwithdpkg "$2" "$3" "$4"
 	testwithdpkg "$2" "$3" "$4"
 }
 }
 
 
+setdrop 'spec-1'
 testprofile 'spec-1' 'foo <!stage1>' '' "$KEEP"
 testprofile 'spec-1' 'foo <!stage1>' '' "$KEEP"
 testprofile 'spec-1' 'foo <!stage1>' 'stage1' "$DROP"
 testprofile 'spec-1' 'foo <!stage1>' 'stage1' "$DROP"
 testprofile 'spec-1' 'foo <!stage1>' 'notest' "$KEEP"
 testprofile 'spec-1' 'foo <!stage1>' 'notest' "$KEEP"
 testprofile 'spec-1' 'foo <!stage1>' 'stage1,notest' "$DROP"
 testprofile 'spec-1' 'foo <!stage1>' 'stage1,notest' "$DROP"
 
 
+setdrop 'spec-2'
 testprofile 'spec-2' 'foo <stage1>' '' "$DROP"
 testprofile 'spec-2' 'foo <stage1>' '' "$DROP"
 testprofile 'spec-2' 'foo <stage1>' 'stage1' "$KEEP"
 testprofile 'spec-2' 'foo <stage1>' 'stage1' "$KEEP"
 testprofile 'spec-2' 'foo <stage1>' 'notest' "$DROP"
 testprofile 'spec-2' 'foo <stage1>' 'notest' "$DROP"
 testprofile 'spec-2' 'foo <stage1>' 'stage1,notest' "$KEEP"
 testprofile 'spec-2' 'foo <stage1>' 'stage1,notest' "$KEEP"
 
 
+setdrop 'spec-3'
 testprofile 'spec-3' 'foo <!stage1 !notest>' '' "$KEEP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' '' "$KEEP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' 'stage1' "$DROP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' 'stage1' "$DROP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' 'notest' "$DROP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' 'notest' "$DROP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' 'stage1,notest' "$DROP"
 testprofile 'spec-3' 'foo <!stage1 !notest>' 'stage1,notest' "$DROP"
 
 
+setdrop 'spec-4'
 testprofile 'spec-4' 'foo <stage1 notest>' '' "$DROP"
 testprofile 'spec-4' 'foo <stage1 notest>' '' "$DROP"
 testprofile 'spec-4' 'foo <stage1 notest>' 'stage1' "$DROP"
 testprofile 'spec-4' 'foo <stage1 notest>' 'stage1' "$DROP"
 testprofile 'spec-4' 'foo <stage1 notest>' 'notest' "$DROP"
 testprofile 'spec-4' 'foo <stage1 notest>' 'notest' "$DROP"
 testprofile 'spec-4' 'foo <stage1 notest>' 'stage1,notest' "$KEEP"
 testprofile 'spec-4' 'foo <stage1 notest>' 'stage1,notest' "$KEEP"
 
 
+setdrop 'spec-5'
 testprofile 'spec-5' 'foo <!stage1 notest>' '' "$DROP"
 testprofile 'spec-5' 'foo <!stage1 notest>' '' "$DROP"
 testprofile 'spec-5' 'foo <!stage1 notest>' 'stage1' "$DROP"
 testprofile 'spec-5' 'foo <!stage1 notest>' 'stage1' "$DROP"
 testprofile 'spec-5' 'foo <!stage1 notest>' 'notest' "$KEEP"
 testprofile 'spec-5' 'foo <!stage1 notest>' 'notest' "$KEEP"
 testprofile 'spec-5' 'foo <!stage1 notest>' 'stage1,notest' "$DROP"
 testprofile 'spec-5' 'foo <!stage1 notest>' 'stage1,notest' "$DROP"
 
 
+setdrop 'spec-6'
 testprofile 'spec-6' 'foo <stage1 !notest>' '' "$DROP"
 testprofile 'spec-6' 'foo <stage1 !notest>' '' "$DROP"
 testprofile 'spec-6' 'foo <stage1 !notest>' 'stage1' "$KEEP"
 testprofile 'spec-6' 'foo <stage1 !notest>' 'stage1' "$KEEP"
 testprofile 'spec-6' 'foo <stage1 !notest>' 'notest' "$DROP"
 testprofile 'spec-6' 'foo <stage1 !notest>' 'notest' "$DROP"
 testprofile 'spec-6' 'foo <stage1 !notest>' 'stage1,notest' "$DROP"
 testprofile 'spec-6' 'foo <stage1 !notest>' 'stage1,notest' "$DROP"
 
 
+setdrop 'spec-7'
 testprofile 'spec-7' 'foo <stage1> <!notest>' '' "$KEEP"
 testprofile 'spec-7' 'foo <stage1> <!notest>' '' "$KEEP"
 testprofile 'spec-7' 'foo <stage1> <!notest>' 'stage1' "$KEEP"
 testprofile 'spec-7' 'foo <stage1> <!notest>' 'stage1' "$KEEP"
 testprofile 'spec-7' 'foo <stage1> <!notest>' 'notest' "$DROP"
 testprofile 'spec-7' 'foo <stage1> <!notest>' 'notest' "$DROP"