Commit 96f3218a authored by Bernhard Link's avatar Bernhard Link

get rid of FAKEARCHITECTURE hack, since lenny DEB_HOST_ARCH is supported

parent 8e0a831b
......@@ -22,7 +22,7 @@ Description: a package not build
.
Package: troettroet
Architecture: $FAKEARCHITECTURE
Architecture: abacus
Description: some test-package
.
END
......@@ -40,7 +40,7 @@ cat > conf/distributions <<EOF
Codename: bla
Suite: test
Components: main
Architectures: source $FAKEARCHITECTURE another
Architectures: source abacus another
Tracking: all
Codename: blub
......@@ -74,7 +74,7 @@ testrun - build-needing test another 3<<EOF
stdout
*=package 1.0-1 pool/main/p/package/package_1.0-1.dsc
EOF
testrun - build-needing test $FAKEARCHITECTURE 3<<EOF
testrun - build-needing test abacus 3<<EOF
stdout
*=package 1.0-1 pool/main/p/package/package_1.0-1.dsc
EOF
......@@ -114,12 +114,12 @@ cd ..
testrun - -C main includedeb test rumsrumsrums_1.0-1_all.deb 3<<EOF
stderr
*=Warning: database 'bla|main|${FAKEARCHITECTURE}' was modified but no index file was exported.
*=Warning: database 'bla|main|abacus' was modified but no index file was exported.
*=Warning: database 'bla|main|another' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
*=db: 'pool/main/p/package/rumsrumsrums_1.0-1_all.deb' added to checksums.db(pool).
*=db: 'rumsrumsrums' added to packages.db(bla|main|${FAKEARCHITECTURE}).
*=db: 'rumsrumsrums' added to packages.db(bla|main|abacus).
*=db: 'rumsrumsrums' added to packages.db(bla|main|another).
EOF
......@@ -127,7 +127,7 @@ testrun - build-needing test another 3<<EOF
stdout
*=package 1.0-1 pool/main/p/package/package_1.0-1.dsc
EOF
testrun - build-needing test $FAKEARCHITECTURE 3<<EOF
testrun - build-needing test abacus 3<<EOF
stdout
*=package 1.0-1 pool/main/p/package/package_1.0-1.dsc
EOF
......@@ -137,20 +137,20 @@ dpkg-gencontrol -ptroettroet
dpkg --build debian/tmp ..
cd ..
testrun - -C main includedeb test troettroet_1.0-1_${FAKEARCHITECTURE}.deb 3<<EOF
testrun - -C main includedeb test troettroet_1.0-1_abacus.deb 3<<EOF
stderr
*=Warning: database 'bla|main|${FAKEARCHITECTURE}' was modified but no index file was exported.
*=Warning: database 'bla|main|abacus' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
*=db: 'pool/main/p/package/troettroet_1.0-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
*=db: 'troettroet' added to packages.db(bla|main|${FAKEARCHITECTURE}).
*=db: 'pool/main/p/package/troettroet_1.0-1_abacus.deb' added to checksums.db(pool).
*=db: 'troettroet' added to packages.db(bla|main|abacus).
EOF
testrun - build-needing test another 3<<EOF
stdout
*=package 1.0-1 pool/main/p/package/package_1.0-1.dsc
EOF
testrun - build-needing test $FAKEARCHITECTURE 3<<EOF
testrun - build-needing test abacus 3<<EOF
stdout
EOF
......@@ -181,7 +181,7 @@ stdout
EOF
testrun empty build-needing test another
testrun empty build-needing test $FAKEARCHITECTURE
testrun empty build-needing test abacus
# TODO: add a new version of that package...
rm -r package-1.0
......@@ -196,7 +196,7 @@ Maintainer: me <me@example.org>
Standards-Version: 0.0
Package: onearch
Architecture: $FAKEARCHITECTURE
Architecture: abacus
Description: some test-onlyonearch
.
END
......@@ -234,22 +234,22 @@ stdout
EOF
testrun empty build-needing test another
testrun - build-needing test $FAKEARCHITECTURE 3<<EOF
testrun - build-needing test abacus 3<<EOF
stdout
*=onlyonearch 1.0-1 pool/main/o/onlyonearch/onlyonearch_1.0-1.dsc
EOF
testrun - --delete -C main includedeb test onearch_1.0-1_${FAKEARCHITECTURE}.deb 3<<EOF
testrun - --delete -C main includedeb test onearch_1.0-1_abacus.deb 3<<EOF
stderr
*=Warning: database 'bla|main|${FAKEARCHITECTURE}' was modified but no index file was exported.
*=Warning: database 'bla|main|abacus' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
-d1*=db: 'pool/main/o/onlyonearch/onearch_1.0-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'onearch' added to packages.db(bla|main|${FAKEARCHITECTURE}).
-d1*=db: 'pool/main/o/onlyonearch/onearch_1.0-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'onearch' added to packages.db(bla|main|abacus).
EOF
testrun empty build-needing test another
testrun empty build-needing test $FAKEARCHITECTURE
testrun empty build-needing test abacus
mkdir onlyarchall-1.0
mkdir onlyarchall-1.0/debian
......@@ -298,21 +298,21 @@ stdout
EOF
testrun empty build-needing test another
testrun empty build-needing test $FAKEARCHITECTURE
testrun empty build-needing test abacus
testrun - --delete -C main includedeb test archall_1.0-1_all.deb 3<<EOF
stderr
*=Warning: database 'bla|main|${FAKEARCHITECTURE}' was modified but no index file was exported.
*=Warning: database 'bla|main|abacus' was modified but no index file was exported.
*=Warning: database 'bla|main|another' was modified but no index file was exported.
*=Changes will only be visible after the next 'export'!
stdout
-d1*=db: 'pool/main/o/onlyarchall/archall_1.0-1_all.deb' added to checksums.db(pool).
-d1*=db: 'archall' added to packages.db(bla|main|${FAKEARCHITECTURE}).
-d1*=db: 'archall' added to packages.db(bla|main|abacus).
-d1*=db: 'archall' added to packages.db(bla|main|another).
EOF
testrun empty build-needing test another
testrun empty build-needing test $FAKEARCHITECTURE
testrun empty build-needing test abacus
rm -r pool conf db *.deb *.log *.changes
testsuccess
This diff is collapsed.
......@@ -39,7 +39,7 @@ fi
mkdir -p conf
cat > conf/distributions <<CONFEND
Codename: test
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
Components: stupid ugly
CONFEND
......@@ -63,7 +63,7 @@ echo $ERRORMSG | grep -q "error:255"
echo "Package: test1" > test/DEBIAN/control
echo "Version: 1" >> test/DEBIAN/control
echo "Maintainer: me <its@me>" >> test/DEBIAN/control
echo "Architecture: ${FAKEARCHITECTURE}" >> test/DEBIAN/control
echo "Architecture: abacus" >> test/DEBIAN/control
echo "Description: test" >> test/DEBIAN/control
echo " bla fasel" >> test/DEBIAN/control
dpkg-deb -b test
......@@ -86,7 +86,7 @@ echo "Version: 1" >> test/DEBIAN/control
echo "Maintainer: me <its@me>" >> test/DEBIAN/control
echo "Section: funnystuff" >> test/DEBIAN/control
echo "Priority: useless" >> test/DEBIAN/control
echo "Architecture: ${FAKEARCHITECTURE}" >> test/DEBIAN/control
echo "Architecture: abacus" >> test/DEBIAN/control
echo "Description: test" >> test/DEBIAN/control
echo " bla fasel" >> test/DEBIAN/control
dpkg-deb -b test
......@@ -99,7 +99,7 @@ echo "Version: 1" >> test/DEBIAN/control
echo "Maintainer: me <its@me>" >> test/DEBIAN/control
echo "Section: funnystuff" >> test/DEBIAN/control
echo "Priority: useless" >> test/DEBIAN/control
echo "Architecture: ${FAKEARCHITECTURE}" >> test/DEBIAN/control
echo "Architecture: abacus" >> test/DEBIAN/control
echo "Description: test" >> test/DEBIAN/control
echo " bla fasel" >> test/DEBIAN/control
(cd test/DEBIAN && tar -cvvzf ../../control.tar.gz ./control)
......
#!/bin/sh
echo ${FAKEARCHITECTURE}
This diff is collapsed.
......@@ -19,7 +19,7 @@ Maintainer: me <guess@who>
Standards-Version: 0.0
Package: $PACKAGE
Architecture: $FAKEARCHITECTURE
Architecture: abacus
Description: bla
blub
......
This diff is collapsed.
......@@ -4,11 +4,11 @@ source $TESTSDIR/test.inc
mkdir conf
cat >conf/distributions <<EOF
Codename: test
Architectures: $FAKEARCHITECTURE source
Architectures: abacus source
Components: all
Codename: copy
Architectures: $FAKEARCHITECTURE source
Architectures: abacus source
Components: all
Pull: rule
EOF
......@@ -47,9 +47,9 @@ stdout
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
-v2*=Created directory "./dists/test/all"
-v2*=Created directory "./dists/test/all/binary-${FAKEARCHITECTURE}"
-v6*= looking for changes in 'test|all|${FAKEARCHITECTURE}'...
-v6*= creating './dists/test/all/binary-${FAKEARCHITECTURE}/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/test/all/binary-abacus"
-v6*= looking for changes in 'test|all|abacus'...
-v6*= creating './dists/test/all/binary-abacus/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/test/all/source"
-v6*= looking for changes in 'test|all|source'...
-v6*= creating './dists/test/all/source/Sources' (gzipped)
......@@ -60,15 +60,15 @@ cat >>pi.rules <<EOF
-v2*=Created directory "./pool/all/a/a$i"
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}.dsc' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}_${i}_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/all/a/a${i}/a${i}-addons_${i}_all.deb' added to checksums.db(pool).
-d1*=db: 'a${i}' added to packages.db(test|all|source).
-d1*=db: 'a${i}' added to packages.db(test|all|${FAKEARCHITECTURE}).
-d1*=db: 'a${i}-addons' added to packages.db(test|all|${FAKEARCHITECTURE}).
-d1*=db: 'a${i}' added to packages.db(test|all|abacus).
-d1*=db: 'a${i}-addons' added to packages.db(test|all|abacus).
-v1*=deleting './i/a${i}.changes'...
-v1*=deleting './i/a${i}_${i}.dsc'...
-v1*=deleting './i/a${i}_${i}.tar.gz'...
-v1*=deleting './i/a${i}_${i}_${FAKEARCHITECTURE}.deb'...
-v1*=deleting './i/a${i}_${i}_abacus.deb'...
-v1*=deleting './i/a${i}-addons_${i}_all.deb'...
EOF
done
......@@ -82,15 +82,15 @@ stdout
-v0*=Calculating packages to pull...
-v3*= pulling into 'copy|all|source'
-v5*= looking what to get from 'test|all|source'
-v3*= pulling into 'copy|all|${FAKEARCHITECTURE}'
-v5*= looking what to get from 'test|all|${FAKEARCHITECTURE}'
-v3*= pulling into 'copy|all|abacus'
-v5*= looking what to get from 'test|all|abacus'
-v0*=Installing (and possibly deleting) packages...
-v0*=Exporting indices...
-v2*=Created directory "./dists/copy"
-v2*=Created directory "./dists/copy/all"
-v2*=Created directory "./dists/copy/all/binary-${FAKEARCHITECTURE}"
-v6*= looking for changes in 'copy|all|${FAKEARCHITECTURE}'...
-v6*= creating './dists/copy/all/binary-${FAKEARCHITECTURE}/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/copy/all/binary-abacus"
-v6*= looking for changes in 'copy|all|abacus'...
-v6*= creating './dists/copy/all/binary-abacus/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/copy/all/source"
-v6*= looking for changes in 'copy|all|source'...
-v6*= creating './dists/copy/all/source/Sources' (gzipped)
......@@ -99,8 +99,8 @@ EOF
for i in $(seq 1 40) ; do
cat >>pull.rules <<EOF
-d1*=db: 'a${i}' added to packages.db(copy|all|source).
-d1*=db: 'a${i}' added to packages.db(copy|all|${FAKEARCHITECTURE}).
-d1*=db: 'a${i}-addons' added to packages.db(copy|all|${FAKEARCHITECTURE}).
-d1*=db: 'a${i}' added to packages.db(copy|all|abacus).
-d1*=db: 'a${i}-addons' added to packages.db(copy|all|abacus).
EOF
done
......@@ -114,7 +114,7 @@ stdout
-v0*=Calculating packages to pull...
-v3*= pulling into 'copy|all|source'
-v5*= marking everything to be deleted
-v3*= pulling into 'copy|all|${FAKEARCHITECTURE}'
-v3*= pulling into 'copy|all|abacus'
#-v5*= marking everything to be deleted
-v0*=Installing (and possibly deleting) packages...
stderr
......@@ -128,7 +128,7 @@ stdout
-v0*=Calculating packages to get...
-v3*= processing updates for 'copy|all|source'
-v5*= marking everything to be deleted
-v3*= processing updates for 'copy|all|${FAKEARCHITECTURE}'
-v3*= processing updates for 'copy|all|abacus'
#-v5*= marking everything to be deleted
stderr
*=Not processing updates for 'copy' because of --onlysmalldeletes!
......
set -u
source $TESTSDIR/test.inc
mkdir -p conf dists/{c,d}/{main,component}/{source,binary-${FAKEARCHITECTURE}}
mkdir -p conf dists/{c,d}/{main,component}/{source,binary-abacus}
mkdir -p dists/{c,d}/main/{source,binary-abacus}
mkdir -p pool/{main,component}/a/aa pool/{main,component}/b/bb
cat > conf/distributions <<EOF
Codename: c
Components: main component
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
# Don't do that at home, kids....
DebIndices: Index .
DscIndices: Index .
......@@ -16,7 +16,7 @@ DscOverride: override-c-dsc
Codename: d
Components: main component
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
# Don't do that at home, kids....
DebIndices: Index .
DscIndices: Index .
......@@ -53,17 +53,17 @@ testrun - --nodelete include c aa.changes 3<<EOF
stdout
-v2*=Created directory "./db"
-d1*=db: 'pool/main/a/aa/aa-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/main/a/aa/aa_1-1.dsc' added to checksums.db(pool).
-d1*=db: 'aa-addons' added to packages.db(c|main|${FAKEARCHITECTURE}).
-d1*=db: 'aa' added to packages.db(c|main|${FAKEARCHITECTURE}).
-d1*=db: 'aa-addons' added to packages.db(c|main|abacus).
-d1*=db: 'aa' added to packages.db(c|main|abacus).
-d1*=db: 'aa' added to packages.db(c|main|source).
-v0*=Exporting indices...
-v6*= looking for changes in 'c|main|${FAKEARCHITECTURE}'...
-v6*= creating './dists/c/main/binary-${FAKEARCHITECTURE}/Index' (uncompressed)
-v6*= looking for changes in 'c|component|${FAKEARCHITECTURE}'...
-v6*= creating './dists/c/component/binary-${FAKEARCHITECTURE}/Index' (uncompressed)
-v6*= looking for changes in 'c|main|abacus'...
-v6*= creating './dists/c/main/binary-abacus/Index' (uncompressed)
-v6*= looking for changes in 'c|component|abacus'...
-v6*= creating './dists/c/component/binary-abacus/Index' (uncompressed)
-v6*= looking for changes in 'c|main|source'...
-v6*= creating './dists/c/main/source/Index' (uncompressed)
-v6*= looking for changes in 'c|component|source'...
......@@ -73,16 +73,16 @@ testrun - --nodelete include c bb.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/component/b/bb/bb-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/component/b/bb/bb_1-1.dsc' added to checksums.db(pool).
-d1*=db: 'bb-addons' added to packages.db(c|component|${FAKEARCHITECTURE}).
-d1*=db: 'bb' added to packages.db(c|component|${FAKEARCHITECTURE}).
-d1*=db: 'bb-addons' added to packages.db(c|component|abacus).
-d1*=db: 'bb' added to packages.db(c|component|abacus).
-d1*=db: 'bb' added to packages.db(c|component|source).
-v0*=Exporting indices...
-v6*= looking for changes in 'c|main|${FAKEARCHITECTURE}'...
-v6*= looking for changes in 'c|component|${FAKEARCHITECTURE}'...
-v6*= replacing './dists/c/component/binary-${FAKEARCHITECTURE}/Index' (uncompressed)
-v6*= looking for changes in 'c|main|abacus'...
-v6*= looking for changes in 'c|component|abacus'...
-v6*= replacing './dists/c/component/binary-abacus/Index' (uncompressed)
-v6*= looking for changes in 'c|main|source'...
-v6*= looking for changes in 'c|component|source'...
-v6*= replacing './dists/c/component/source/Index' (uncompressed)
......@@ -101,17 +101,17 @@ testrun - --nodelete include d aa.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/component/a/aa/aa-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/component/a/aa/aa_1-1.dsc' added to checksums.db(pool).
-d1*=db: 'aa-addons' added to packages.db(d|component|${FAKEARCHITECTURE}).
-d1*=db: 'aa' added to packages.db(d|component|${FAKEARCHITECTURE}).
-d1*=db: 'aa-addons' added to packages.db(d|component|abacus).
-d1*=db: 'aa' added to packages.db(d|component|abacus).
-d1*=db: 'aa' added to packages.db(d|component|source).
-v0*=Exporting indices...
-v6*= looking for changes in 'd|component|${FAKEARCHITECTURE}'...
-v6*= creating './dists/d/component/binary-${FAKEARCHITECTURE}/Index' (uncompressed)
-v6*= looking for changes in 'd|main|${FAKEARCHITECTURE}'...
-v6*= creating './dists/d/main/binary-${FAKEARCHITECTURE}/Index' (uncompressed)
-v6*= looking for changes in 'd|component|abacus'...
-v6*= creating './dists/d/component/binary-abacus/Index' (uncompressed)
-v6*= looking for changes in 'd|main|abacus'...
-v6*= creating './dists/d/main/binary-abacus/Index' (uncompressed)
-v6*= looking for changes in 'd|component|source'...
-v6*= creating './dists/d/component/source/Index' (uncompressed)
-v6*= looking for changes in 'd|main|source'...
......@@ -121,16 +121,16 @@ testrun - --nodelete include d bb.changes 3<<EOF
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'pool/main/b/bb/bb-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/main/b/bb/bb_1-1.dsc' added to checksums.db(pool).
-d1*=db: 'bb-addons' added to packages.db(d|main|${FAKEARCHITECTURE}).
-d1*=db: 'bb' added to packages.db(d|main|${FAKEARCHITECTURE}).
-d1*=db: 'bb-addons' added to packages.db(d|main|abacus).
-d1*=db: 'bb' added to packages.db(d|main|abacus).
-d1*=db: 'bb' added to packages.db(d|main|source).
-v0*=Exporting indices...
-v6*= looking for changes in 'd|component|${FAKEARCHITECTURE}'...
-v6*= looking for changes in 'd|main|${FAKEARCHITECTURE}'...
-v6*= replacing './dists/d/main/binary-${FAKEARCHITECTURE}/Index' (uncompressed)
-v6*= looking for changes in 'd|component|abacus'...
-v6*= looking for changes in 'd|main|abacus'...
-v6*= replacing './dists/d/main/binary-abacus/Index' (uncompressed)
-v6*= looking for changes in 'd|component|source'...
-v6*= looking for changes in 'd|main|source'...
-v6*= replacing './dists/d/main/source/Index' (uncompressed)
......
......@@ -19,17 +19,17 @@ CONFEND
cat > conf/distributions <<CONFEND
Codename: ATest
Uploaders: auploaders
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
Components: everything
Codename: BTest
Uploaders: buploaders
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
Components: everything
Codename: CTest
Uploaders: cuploaders
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
Components: everything
CONFEND
......@@ -108,19 +108,19 @@ stdout
-v2*=Created directory "./pool/everything/p"
-v2*=Created directory "./pool/everything/p/package"
-d1*=db: 'pool/everything/p/package/package-addons_9-2_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/everything/p/package/package_9-2_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/everything/p/package/package_9-2_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/everything/p/package/package_9-2.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/everything/p/package/package_9-2.dsc' added to checksums.db(pool).
-d1*=db: 'package-addons' added to packages.db(CTest|everything|${FAKEARCHITECTURE}).
-d1*=db: 'package' added to packages.db(CTest|everything|${FAKEARCHITECTURE}).
-d1*=db: 'package-addons' added to packages.db(CTest|everything|abacus).
-d1*=db: 'package' added to packages.db(CTest|everything|abacus).
-d1*=db: 'package' added to packages.db(CTest|everything|source).
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/CTest"
-v2*=Created directory "./dists/CTest/everything"
-v2*=Created directory "./dists/CTest/everything/binary-${FAKEARCHITECTURE}"
-v6*= looking for changes in 'CTest|everything|${FAKEARCHITECTURE}'...
-v6*= creating './dists/CTest/everything/binary-${FAKEARCHITECTURE}/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/CTest/everything/binary-abacus"
-v6*= looking for changes in 'CTest|everything|abacus'...
-v6*= creating './dists/CTest/everything/binary-abacus/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/CTest/everything/source"
-v6*= looking for changes in 'CTest|everything|source'...
-v6*= creating './dists/CTest/everything/source/Sources' (gzipped)
......@@ -149,8 +149,8 @@ EOF
testrun - -b . include CTest testbadsigned.changes 3<<EOF
stderr
=Data seems not to be signed trying to use directly...
*=Skipping inclusion of 'package-addons' '9-2' in 'CTest|everything|${FAKEARCHITECTURE}', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|${FAKEARCHITECTURE}', as it has already '9-2'.
*=Skipping inclusion of 'package-addons' '9-2' in 'CTest|everything|abacus', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|abacus', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|source', as it has already '9-2'.
stdout
EOF
......@@ -181,8 +181,8 @@ testrun - -b . include CTest testrevsigned.changes 3<<EOF
stderr
-v1*=Ignoring signature with '12D6C95C8C737389EAAF535972F1D61F685AF714' on 'testrevsigned.changes', as the key is revoked.
=Data seems not to be signed trying to use directly...
*=Skipping inclusion of 'package-addons' '9-2' in 'CTest|everything|${FAKEARCHITECTURE}', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|${FAKEARCHITECTURE}', as it has already '9-2'.
*=Skipping inclusion of 'package-addons' '9-2' in 'CTest|everything|abacus', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|abacus', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|source', as it has already '9-2'.
stdout
EOF
......@@ -201,15 +201,15 @@ testrun - -b . include BTest testsigned.changes 3<<EOF
stderr
=Data seems not to be signed trying to use directly...
stdout
-d1*=db: 'package-addons' added to packages.db(BTest|everything|${FAKEARCHITECTURE}).
-d1*=db: 'package' added to packages.db(BTest|everything|${FAKEARCHITECTURE}).
-d1*=db: 'package-addons' added to packages.db(BTest|everything|abacus).
-d1*=db: 'package' added to packages.db(BTest|everything|abacus).
-d1*=db: 'package' added to packages.db(BTest|everything|source).
-v0*=Exporting indices...
-v2*=Created directory "./dists/BTest"
-v2*=Created directory "./dists/BTest/everything"
-v2*=Created directory "./dists/BTest/everything/binary-${FAKEARCHITECTURE}"
-v6*= looking for changes in 'BTest|everything|${FAKEARCHITECTURE}'...
-v6*= creating './dists/BTest/everything/binary-${FAKEARCHITECTURE}/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/BTest/everything/binary-abacus"
-v6*= looking for changes in 'BTest|everything|abacus'...
-v6*= creating './dists/BTest/everything/binary-abacus/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/BTest/everything/source"
-v6*= looking for changes in 'BTest|everything|source'...
-v6*= creating './dists/BTest/everything/source/Sources' (gzipped)
......@@ -218,8 +218,8 @@ EOF
testrun - -b . include CTest testsigned.changes 3<<EOF
stderr
=Data seems not to be signed trying to use directly...
*=Skipping inclusion of 'package-addons' '9-2' in 'CTest|everything|${FAKEARCHITECTURE}', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|${FAKEARCHITECTURE}', as it has already '9-2'.
*=Skipping inclusion of 'package-addons' '9-2' in 'CTest|everything|abacus', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|abacus', as it has already '9-2'.
*=Skipping inclusion of 'package' '9-2' in 'CTest|everything|source', as it has already '9-2'.
stdout
EOF
......@@ -239,13 +239,13 @@ stderr
=Data seems not to be signed trying to use directly...
stdout
-v3*=Will not put 'package' in 'CTest|everything|source', as already there with same version '9-2'.
-v3*=Will not put 'package' in 'CTest|everything|${FAKEARCHITECTURE}', as already there with same version '9-2'.
-v3*=Will not put 'package-addons' in 'CTest|everything|${FAKEARCHITECTURE}', as already there with same version '9-2'.
-v3*=Will not put 'package' in 'CTest|everything|abacus', as already there with same version '9-2'.
-v3*=Will not put 'package-addons' in 'CTest|everything|abacus', as already there with same version '9-2'.
-v0*=Skipping test.changes because all packages are skipped!
-v3*=deleting './i/package_9-2.dsc'...
-v3*=deleting './i/package-addons_9-2_all.deb'...
-v3*=deleting './i/package_9-2.tar.gz'...
-v3*=deleting './i/package_9-2_${FAKEARCHITECTURE}.deb'...
-v3*=deleting './i/package_9-2_abacus.deb'...
-v3*=deleting './i/test.changes'...
EOF
......@@ -268,13 +268,13 @@ stderr
#-v0*='testrevsigned.changes' would have been accepted into 'BTest' if signature with '12D6C95C8C737389EAAF535972F1D61F685AF714' was checkable and valid.
stdout
-v3*=Will not put 'package' in 'CTest|everything|source', as already there with same version '9-2'.
-v3*=Will not put 'package' in 'CTest|everything|${FAKEARCHITECTURE}', as already there with same version '9-2'.
-v3*=Will not put 'package-addons' in 'CTest|everything|${FAKEARCHITECTURE}', as already there with same version '9-2'.
-v3*=Will not put 'package' in 'CTest|everything|abacus', as already there with same version '9-2'.
-v3*=Will not put 'package-addons' in 'CTest|everything|abacus', as already there with same version '9-2'.
-v0*=Skipping testrevsigned.changes because all packages are skipped!
-v3*=deleting './i/package_9-2.dsc'...
-v3*=deleting './i/package-addons_9-2_all.deb'...
-v3*=deleting './i/package_9-2.tar.gz'...
-v3*=deleting './i/package_9-2_${FAKEARCHITECTURE}.deb'...
-v3*=deleting './i/package_9-2_abacus.deb'...
-v3*=deleting './i/testrevsigned.changes'...
EOF
......@@ -293,13 +293,13 @@ stderr
=Data seems not to be signed trying to use directly...
stdout
-v3*=Will not put 'package' in 'CTest|everything|source', as already there with same version '9-2'.
-v3*=Will not put 'package' in 'CTest|everything|${FAKEARCHITECTURE}', as already there with same version '9-2'.
-v3*=Will not put 'package-addons' in 'CTest|everything|${FAKEARCHITECTURE}', as already there with same version '9-2'.
-v3*=Will not put 'package' in 'CTest|everything|abacus', as already there with same version '9-2'.
-v3*=Will not put 'package-addons' in 'CTest|everything|abacus', as already there with same version '9-2'.
-v0*=Skipping testbadsigned.changes because all packages are skipped!
-v3*=deleting './i/package_9-2.dsc'...
-v3*=deleting './i/package-addons_9-2_all.deb'...
-v3*=deleting './i/package_9-2.tar.gz'...
-v3*=deleting './i/package_9-2_${FAKEARCHITECTURE}.deb'...
-v3*=deleting './i/package_9-2_abacus.deb'...
-v3*=deleting './i/testbadsigned.changes'...
EOF
......
......@@ -8,7 +8,7 @@ gpg --import $TESTSDIR/good.key
mkdir -p conf
cat > conf/distributions <<CONFEND
Codename: ATest
Architectures: ${FAKEARCHITECTURE} source
Architectures: abacus source
Components: everything
SignWith: good@nowhere.tld
CONFEND
......@@ -22,9 +22,9 @@ stdout
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/ATest"
-v2*=Created directory "./dists/ATest/everything"
-v2*=Created directory "./dists/ATest/everything/binary-${FAKEARCHITECTURE}"
-v6*= exporting 'ATest|everything|${FAKEARCHITECTURE}'...
-v6*= creating './dists/ATest/everything/binary-${FAKEARCHITECTURE}/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/ATest/everything/binary-abacus"
-v6*= exporting 'ATest|everything|abacus'...
-v6*= creating './dists/ATest/everything/binary-abacus/Packages' (uncompressed,gzipped)
-v2*=Created directory "./dists/ATest/everything/source"
-v6*= exporting 'ATest|everything|source'...
-v6*= creating './dists/ATest/everything/source/Sources' (gzipped)
......
This diff is collapsed.
......@@ -43,8 +43,6 @@ echo "$@"
"$@"
}
FAKEARCHITECTURE=abacus
if test -z "$SRCDIR" || ! test -d "$SRCDIR" ; then
echo "SRCDIR='$SRCDIR' not a valid directory!" >&2
exit 1
......@@ -58,10 +56,8 @@ if test -z "$WORKDIR" || ! test -d "$WORKDIR" ; then
exit 1
fi
export FAKEARCHITECTURE
export FALEN=${#FAKEARCHITECTURE}
# new dpkg-dev supports a fake architecture without tricks (and the old tricks no longer work):
export DEB_HOST_ARCH="$FAKEARCHITECTURE"
# avoid architecture dependency of the test-suite:
export DEB_HOST_ARCH="abacus"
export PATH="$TESTSDIR:$PATH"
if ! [ -x "$REPREPRO" ] ; then
......
......@@ -7,7 +7,7 @@ echo "export never" > conf/options
cat > conf/distributions <<EOF
Codename: breakme
Components: something
Architectures: $FAKEARCHITECTURE coal source
Architectures: abacus coal source
Tracking: all
EOF
......@@ -27,12 +27,12 @@ stdout
-v2*=Created directory "./pool/something/a"
-v2*=Created directory "./pool/something/a/aa"
-d1*=db: 'pool/something/a/aa/aa-addons_1-1_all.deb' added to checksums.db(pool).
-d1*=db: 'pool/something/a/aa/aa_1-1_${FAKEARCHITECTURE}.deb' added to checksums.db(pool).
-d1*=db: 'pool/something/a/aa/aa_1-1_abacus.deb' added to checksums.db(pool).
-d1*=db: 'pool/something/a/aa/aa_1-1.tar.gz' added to checksums.db(pool).
-d1*=db: 'pool/something/a/aa/aa_1-1.dsc' added to checksums.db(pool).
-d1*=db: 'aa-addons' added to packages.db(breakme|something|${FAKEARCHITECTURE}).
-d1*=db: 'aa-addons' added to packages.db(breakme|something|abacus).
-d1*=db: 'aa-addons' added to packages.db(breakme|something|coal).
-d1*=db: 'aa' added to packages.db(breakme|something|${FAKEARCHITECTURE}).
-d1*=db: 'aa' added to packages.db(breakme|something|abacus).
-d1*=db: 'aa' added to packages.db(breakme|something|source).
-d1*=db: 'aa' added to tracking.db(breakme).
EOF
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment