Commit a9b1ffd3 authored by Bernhard Link's avatar Bernhard Link

[testsuite] add more macros for database operation output (tracking)

parent 8600bef6
......@@ -104,7 +104,7 @@ stdout
$(ofa 'pool/main/p/package/package_1.0-1.dsc')
$(ofa 'pool/main/p/package/package_1.0-1.tar.gz')
-d1*=db: 'package' added to packages.db(bla|main|source).
-d1*=db: 'package' added to tracking.db(bla).
$(ota 'bla' 'package')
EOF
rm package_1.0*
......@@ -273,7 +273,7 @@ stdout
$(ofa 'pool/main/o/onlyonearch/onlyonearch_1.0-1.dsc')
$(ofa 'pool/main/o/onlyonearch/onlyonearch_1.0-1.tar.gz')
-d1*=db: 'onlyonearch' added to packages.db(bla|main|source).
-d1*=db: 'onlyonearch' added to tracking.db(bla).
$(ota 'bla' 'onlyonearch')
EOF
testrun empty build-needing test another
......@@ -340,7 +340,7 @@ stdout
$(ofa 'pool/main/o/onlyarchall/onlyarchall_1.0-1.dsc')
$(ofa 'pool/main/o/onlyarchall/onlyarchall_1.0-1.tar.gz')
-d1*=db: 'onlyarchall' added to packages.db(bla|main|source).
-d1*=db: 'onlyarchall' added to tracking.db(bla).
$(ota 'bla' 'onlyarchall')
EOF
testrun empty build-needing test another
......@@ -431,7 +431,7 @@ stdout
$(ofa 'pool/main/a/allandany/allandany_1.0-1.dsc')
$(ofa 'pool/main/a/allandany/allandany_1.0-1.tar.gz')
-d1*=db: 'allandany' added to packages.db(bla|main|source).
-d1*=db: 'allandany' added to tracking.db(bla).
$(ota 'bla' 'allandany')
EOF
testrun - build-needing test another 3<<EOF
......@@ -534,7 +534,7 @@ stdout
$(ofa 'pool/main/a/anyonly/anyonly_1.0-1.dsc')
$(ofa 'pool/main/a/anyonly/anyonly_1.0-1.tar.gz')
-d1*=db: 'anyonly' added to packages.db(bla|main|source).
-d1*=db: 'anyonly' added to tracking.db(bla).
$(ota 'bla' 'anyonly')
EOF
testrun empty build-needing test all
......@@ -601,7 +601,7 @@ stdout
$(ofa 'pool/main/l/linuxwildcard/linuxwildcard_1.0-1.dsc')
$(ofa 'pool/main/l/linuxwildcard/linuxwildcard_1.0-1.tar.gz')
-d1*=db: 'linuxwildcard' added to packages.db(oses|main|source).
-d1*=db: 'linuxwildcard' added to tracking.db(oses).
$(ota 'oses' 'linuxwildcard')
EOF
testrun - includedsc oses kfreebsdwildcard_1.0-1.dsc 3<<EOF
......@@ -613,7 +613,7 @@ stdout
$(ofa 'pool/main/k/kfreebsdwildcard/kfreebsdwildcard_1.0-1.dsc')
$(ofa 'pool/main/k/kfreebsdwildcard/kfreebsdwildcard_1.0-1.tar.gz')
-d1*=db: 'kfreebsdwildcard' added to packages.db(oses|main|source).
-d1*=db: 'kfreebsdwildcard' added to tracking.db(oses).
$(ota 'oses' 'kfreebsdwildcard')
EOF
testrun empty build-needing oses all
......
......@@ -32,7 +32,7 @@ $(ofa 'pool/one/a/aa/aa_1-1.dsc')
-d1*=db: 'aa-addons' added to packages.db(a|one|abacus).
-d1*=db: 'aa' added to packages.db(a|one|abacus).
-d1*=db: 'aa' added to packages.db(a|one|source).
-t1*=db: 'aa' added to tracking.db(a).
$(otta 'a' 'aa')
-v5*=Deleting 'test.changes'.
EOF
......@@ -52,7 +52,7 @@ $(ofa 'pool/two/a/aa/aa_1-2.dsc')
-d1*=db: 'aa-addons' added to packages.db(a|two|abacus).
-d1*=db: 'aa' added to packages.db(a|two|abacus).
-d1*=db: 'aa' added to packages.db(a|two|source).
-t1*=db: 'aa' added to tracking.db(a).
$(otta 'a' 'aa')
-v5*=Deleting 'test.changes'.
EOF
......
......@@ -201,7 +201,7 @@ testrun - -b . retrack test 3<<EOF
stdout
*=Retracking test...
#2 times:
-d1*=db: 'test' added to tracking.db(test).
$(ota 'test' 'test')
EOF
fi
......@@ -428,7 +428,7 @@ $(ofa 'pool/main/t/test/sibling_2_another.deb')
-d1*=db: 'mytest' added to packages.db(two|main|another).
-d1*=db: 'siblingtoo' added to packages.db(two|main|another).
-d1*=db: 'sibling' added to packages.db(two|main|another).
-t1*=db: 'test' added to tracking.db(two).
$(otta 'two' 'test')
-v1*=deleting './i/mytest_2_all.deb'...
-v1*=deleting './i/siblingtoo_3_another.deb'...
-v1*=deleting './i/test-1.changes'...
......@@ -535,7 +535,7 @@ stdout
-d1*=db: 'mytest' added to packages.db(two|main|abacus).
-d1*=db: 'siblingalso' added to packages.db(two|main|abacus).
-d1*=db: 'sibling' added to packages.db(two|main|abacus).
-t1*=db: 'test' added to tracking.db(two).
$(otta 'two' 'test')
-v1*=deleting './i/mytest_2.4_all.deb'...
-v1*=deleting './i/siblingalso_3.1_abacus.deb'...
-v1*=deleting './i/sibling_2.2_abacus.deb'...
......
......@@ -130,7 +130,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
......@@ -225,7 +225,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
......@@ -282,7 +282,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v0*=Exporting indices...
-v2*=Created directory "./dists"
-v2*=Created directory "./dists/test"
......@@ -379,7 +379,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
......@@ -456,7 +456,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
......@@ -515,7 +515,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
......@@ -596,7 +596,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
......@@ -651,7 +651,7 @@ $(ofa 'pool/main/d/documentation/documentation_9876AD.tar.gz')
$(ofa 'pool/main/d/documentation/documentation_9876AD.dsc')
-d1*=db: 'documentation' added to packages.db(test|main|coal).
-d1*=db: 'documentation' added to packages.db(test|main|source).
-d1*=db: 'documentation' added to tracking.db(test).
$(ota 'test' 'documentation')
-v3*=deleting './i/documentation_9876AD_all.deb'...
-v3*=deleting './i/documentation_9876AD_coal+all.log'...
-v3*=deleting './i/documentation_9876AD.tar.gz'...
......
......@@ -183,6 +183,12 @@ odb() {
printf -- '-v2*=Created directory "./db"'
}
ota() {
printf -- "-d1*=db: '%s' added to tracking.db(%s)." "$2" "$1"
}
otta() {
printf -- "-t1*=db: '%s' added to tracking.db(%s)." "$2" "$1"
}
ofa() {
printf -- "-d1*=db: '%s' added to checksums.db(pool)." "$1"
}
......
......@@ -28,7 +28,7 @@ $(ofa 'pool/something/a/aa/aa_1-1.dsc')
-d1*=db: 'aa-addons' added to packages.db(breakme|something|coal).
-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).
$(ota 'breakme' 'aa')
EOF
rm aa_* aa-addons* test.changes
......
......@@ -332,7 +332,7 @@ $(ofa 'pool/stupid/s/simple/simple_1_source+all+abacus.changes')
-d1*=db: 'simple-addons' added to packages.db(test1|stupid|abacus).
-d1*=db: 'simple' added to packages.db(test1|stupid|abacus).
-d1*=db: 'simple' added to packages.db(test1|stupid|source).
-d1*=db: 'simple' added to tracking.db(test1).
$(ota 'test1' 'simple')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= replacing './dists/test1/stupid/binary-abacus/Packages' (uncompressed,gzipped,bzip2ed)
......@@ -363,7 +363,7 @@ $(ofa 'pool/ugly/b/bloat+-0a9z.app/bloat+-0a9z.app_99:0.9-A:Z+a:z-0+aA.9zZ_sourc
-d1*=db: 'bloat+-0a9z.app-addons' added to packages.db(test1|ugly|abacus).
-d1*=db: 'bloat+-0a9z.app' added to packages.db(test1|ugly|abacus).
-d1*=db: 'bloat+-0a9z.app' added to packages.db(test1|ugly|source).
-d1*=db: 'bloat+-0a9z.app' added to tracking.db(test1).
$(ota 'test1' 'bloat+-0a9z.app')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= looking for changes in 'test1|stupid|source'...
......@@ -1118,7 +1118,7 @@ $(ofa 'pool/ugly/b/bloat+-0a9z.app/bloat+-0a9z.app_99:0.9-A:Z+a:z-0+aA.9zZ_sourc
-d1*=db: 'bloat+-0a9z.app-addons' added to packages.db(test1|ugly|abacus).
-d1*=db: 'bloat+-0a9z.app' added to packages.db(test1|ugly|abacus).
-d1*=db: 'bloat+-0a9z.app' added to packages.db(test1|ugly|source).
-d1*=db: 'bloat+-0a9z.app' added to tracking.db(test1).
$(ota 'test1' 'bloat+-0a9z.app')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= looking for changes in 'test1|stupid|source'...
......@@ -1148,7 +1148,7 @@ $(ofa 'pool/ugly/b/bloat+-0a9z.app/bloat+-0a9z.app_99:9.0-A:Z+a:z-0+aA.9zZ_sourc
-d1*=db: 'bloat+-0a9z.app' added to packages.db(test1|ugly|abacus).
-d1*=db: 'bloat+-0a9z.app' removed from packages.db(test1|ugly|source).
-d1*=db: 'bloat+-0a9z.app' added to packages.db(test1|ugly|source).
-d1*=db: 'bloat+-0a9z.app' added to tracking.db(test1).
$(ota 'test1' 'bloat+-0a9z.app')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= looking for changes in 'test1|stupid|source'...
......@@ -1172,7 +1172,7 @@ stdout
-v2*=Created directory "./pool/stupid/s/simple"
$(ofa 'pool/stupid/s/simple/simple_1_abacus.deb')
-d1*=db: 'simple' added to packages.db(test1|stupid|abacus).
-d1*=db: 'simple' added to tracking.db(test1).
$(ota 'test1' 'simple')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= replacing './dists/test1/stupid/binary-abacus/Packages' (uncompressed,gzipped,bzip2ed)
......@@ -1290,7 +1290,7 @@ $(ofa 'pool/stupid/t/test/test_1-2_source+all+abacus.changes')
-d1*=db: 'test-addons' added to packages.db(test1|stupid|abacus).
-d1*=db: 'test' added to packages.db(test1|stupid|abacus).
-d1*=db: 'test' added to packages.db(test1|stupid|source).
-d1*=db: 'test' added to tracking.db(test1).
$(ota 'test1' 'test')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= replacing './dists/test1/stupid/binary-abacus/Packages' (uncompressed,gzipped,bzip2ed)
......@@ -1321,7 +1321,7 @@ $(ofa 'pool/stupid/t/testb/testb_1:2-2_source+all+abacus.changes')
-d1*=db: 'testb-addons' added to packages.db(test1|stupid|abacus).
-d1*=db: 'testb' added to packages.db(test1|stupid|abacus).
-d1*=db: 'testb' added to packages.db(test1|stupid|source).
-d1*=db: 'testb' added to tracking.db(test1).
$(ota 'test1' 'testb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= replacing './dists/test1/stupid/binary-abacus/Packages' (uncompressed,gzipped,bzip2ed)
......@@ -1352,7 +1352,7 @@ $(ofa 'pool/stupid/t/testb/testb_1:2-3_source+all+abacus.changes')
-d1*=db: 'testb' added to packages.db(test1|stupid|abacus).
-d1*=db: 'testb' removed from packages.db(test1|stupid|source).
-d1*=db: 'testb' added to packages.db(test1|stupid|source).
-d1*=db: 'testb' added to tracking.db(test1).
$(ota 'test1' 'testb')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= replacing './dists/test1/stupid/binary-abacus/Packages' (uncompressed,gzipped,bzip2ed)
......@@ -1386,7 +1386,7 @@ $(ofa 'pool/stupid/4/4test/4test_1:0b.1-1_source+all+abacus.changes')
-d1*=db: '4test-addons' added to packages.db(test1|stupid|abacus).
-d1*=db: '4test' added to packages.db(test1|stupid|abacus).
-d1*=db: '4test' added to packages.db(test1|stupid|source).
-d1*=db: '4test' added to tracking.db(test1).
$(ota 'test1' '4test')
-v0*=Exporting indices...
-v6*= looking for changes in 'test1|stupid|abacus'...
-v6*= replacing './dists/test1/stupid/binary-abacus/Packages' (uncompressed,gzipped,bzip2ed)
......@@ -1669,7 +1669,7 @@ sed -i -e 's/^Tracking: minimal/Tracking: minimal includechanges/' conf/distribu
testrun - -b . retrack 3<<EOF
stdout
-v1*=Retracking test1...
-d1*=db: 'bloat+-0a9z.app' added to tracking.db(test1).
$(ota 'test1' 'bloat+-0a9z.app')
-x1*= Tracking test1|stupid|abacus...
-x1*= Tracking test1|stupid|source...
-x1*= Tracking test1|ugly|abacus...
......
......@@ -187,7 +187,7 @@ $(ofa 'pool/all/a/aa/aa_1-1.dsc')
-d1*=db: 'aa-addons' added to packages.db(a|all|abacus).
-d1*=db: 'aa' added to packages.db(a|all|abacus).
-d1*=db: 'aa' added to packages.db(a|all|source).
-t1*=db: 'aa' added to tracking.db(a).
$(otta 'a' 'aa')
-v5*=Deleting 'test.changes'.
EOF
checklog logab << EOF
......@@ -278,7 +278,7 @@ $(ofa 'pool/all/a/aa/aa_1-2.dsc')
-d1*=db: 'aa' added to packages.db(a|all|abacus).
-d1*=db: 'aa' removed from packages.db(a|all|source).
-d1*=db: 'aa' added to packages.db(a|all|source).
-t1*=db: 'aa' added to tracking.db(a).
$(otta 'a' 'aa')
-t1*=db: 'aa' '1-1' removed from tracking.db(a).
-v0*=Exporting indices...
-v2*=Created directory "./dists/a"
......@@ -373,7 +373,7 @@ $(ofa 'pool/all/a/aa/aa_1-3.dsc')
-d1*=db: 'aa' added to packages.db(a|all|abacus).
-d1*=db: 'aa' removed from packages.db(a|all|source).
-d1*=db: 'aa' added to packages.db(a|all|source).
-t1*=db: 'aa' added to tracking.db(a).
$(otta 'a' 'aa')
-t1*=db: 'aa' '1-2' removed from tracking.db(a).
-v0*=Deleting files no longer referenced...
$(ofd 'pool/all/a/aa/aa_1-2.dsc')
......@@ -421,7 +421,7 @@ $(ofa 'pool/all/a/ab/ab_2-1.dsc')
-d1*=db: 'ab-addons' added to packages.db(a|all|abacus).
-d1*=db: 'ab' added to packages.db(a|all|abacus).
-d1*=db: 'ab' added to packages.db(a|all|source).
-t1*=db: 'ab' added to tracking.db(a).
$(otta 'a' 'ab')
-v5*=Deleting 'test.changes'.
EOF
checklog logab << EOF
......@@ -515,7 +515,7 @@ $(ofa 'pool/all/a/ab/ab_3-1_abacus.deb')
-d1*=db: 'ab-addons' added to packages.db(a|all|abacus).
-d1*=db: 'ab' removed from packages.db(a|all|abacus).
-d1*=db: 'ab' added to packages.db(a|all|abacus).
-t1*=db: 'ab' added to tracking.db(a).
$(otta 'a' 'ab')
-v0*=Exporting indices...
-v2*=Created directory "./dists/a"
-v2*=Created directory "./dists/a/all"
......
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