Adding upstream version 5.4.4.upstream/5.4.4

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 271 insertions, 0 deletions

diff --git a/tests/diffgeneration.test b/tests/diffgeneration.test
new file mode 100644
index 0000000..8594659
--- /dev/null
+++ b/tests/diffgeneration.test
@@ -0,0 +1,271 @@
+set -u
+. "$TESTSDIR"/test.inc
+
+# testing with Sources, as they are easier to generate...
+
+if ! test -e "$RREDTOOL" ; then
+	echo "SKIPPED: rredtool not found, '$RREDTOOL' tried."
+	exit 0
+fi
+
+mkdir conf
+cat > conf/distributions <<EOF
+Codename: test
+Architectures: source
+Components: main
+DscIndices: Sources Release . .gz $RREDTOOL
+EOF
+
+# Section and Priority in .dsc are a reprepro extension...
+
+echo "Dummy file" > test_1.tar.gz
+cat > test_1.dsc <<EOF
+Format: 1.0
+Source: test
+Binary: more or less
+Architecture: who knows what
+Version: 1
+Section: test
+Priority: extra
+Maintainer: Guess Who <its@me>
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaa some lines to make it long enough aaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+X-Data: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+Files:
+ $(mdandsize test_1.tar.gz) test_1.tar.gz
+EOF
+echo "Dummy file" > pre_1.tar.gz
+cat > pre_1.dsc <<EOF
+Format: 1.0
+Source: pre
+Binary: pre
+Architecture: all
+Version: 1
+Maintainer: Guess Who <its@me>
+Section: pre
+Priority: extra
+Files:
+ $(mdandsize pre_1.tar.gz) pre_1.tar.gz
+EOF
+echo "New file" > pre_2.tar.gz
+cat > pre_2.dsc <<EOF
+Format: 1.0
+Source: pre
+Binary: pre
+Architecture: all
+Version: 2
+Maintainer: Guess Who <its@me>
+Section: pre
+Priority: extra
+Files:
+ $(mdandsize pre_2.tar.gz) pre_2.tar.gz
+EOF
+echo "Even newer" > pre_3.tar.gz
+cat > pre_3.dsc <<EOF
+Format: 1.0
+Source: pre
+Binary: pre
+Architecture: all
+Version: 3
+Maintainer: Guess Who <its@me>
+Section: pre
+Priority: extra
+Files:
+ $(mdandsize pre_3.tar.gz) pre_3.tar.gz
+EOF
+
+mkdir old
+testrun - includedsc test test_1.dsc 3<<EOF
+-v1*=test_1.dsc: component guessed as 'main'
+stdout
+$(odb)
+-v2*=Created directory "./pool"
+-v2*=Created directory "./pool/main"
+-v2*=Created directory "./pool/main/t"
+-v2*=Created directory "./pool/main/t/test"
+$(ofa 'pool/main/t/test/test_1.dsc')
+$(ofa 'pool/main/t/test/test_1.tar.gz')
+$(opa 'test' 1 'test' 'main' 'source' 'dsc')
+-v0*=Exporting indices...
+-v2*=Created directory "./dists"
+-v2*=Created directory "./dists/test"
+-v2*=Created directory "./dists/test/main"
+-v2*=Created directory "./dists/test/main/source"
+-v6*= looking for changes in 'test|main|source'...
+-v6*=  creating './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
+EOF
+dodo cp dists/test/main/source/Sources old/0
+dodo test "!" -e dists/test/main/source/Sources.diff
+testrun - includedsc test pre_1.dsc 3<<EOF
+-v1*=pre_1.dsc: component guessed as 'main'
+stdout
+-v2*=Created directory "./pool/main/p"
+-v2*=Created directory "./pool/main/p/pre"
+$(ofa 'pool/main/p/pre/pre_1.dsc')
+$(ofa 'pool/main/p/pre/pre_1.tar.gz')
+$(opa 'pre' 1 'test' 'main' 'source' 'dsc')
+-v0*=Exporting indices...
+-v6*= looking for changes in 'test|main|source'...
+-v6*=  replacing './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
+EOF
+dodo cp dists/test/main/source/Sources old/1
+dodo test -f dists/test/main/source/Sources.diff/Index
+testrun - includedsc test pre_2.dsc 3<<EOF
+-v1*=pre_2.dsc: component guessed as 'main'
+stdout
+$(ofa 'pool/main/p/pre/pre_2.dsc')
+$(ofa 'pool/main/p/pre/pre_2.tar.gz')
+$(opu 'pre' 1 2 'test' 'main' 'source' 'dsc')
+-v0*=Exporting indices...
+-v0*=Deleting files no longer referenced...
+$(ofd 'pool/main/p/pre/pre_1.dsc')
+$(ofd 'pool/main/p/pre/pre_1.tar.gz')
+-v6*= looking for changes in 'test|main|source'...
+-v6*=  replacing './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
+EOF
+dodo cp dists/test/main/source/Sources old/2
+dodo test -f dists/test/main/source/Sources.diff/Index
+testrun - includedsc test pre_3.dsc 3<<EOF
+-v1*=pre_3.dsc: component guessed as 'main'
+stdout
+$(ofa 'pool/main/p/pre/pre_3.dsc')
+$(ofa 'pool/main/p/pre/pre_3.tar.gz')
+$(opu 'pre' 2 3 'test' 'main' 'source' 'dsc')
+-v0*=Exporting indices...
+-v0*=Deleting files no longer referenced...
+$(ofd 'pool/main/p/pre/pre_2.dsc')
+$(ofd 'pool/main/p/pre/pre_2.tar.gz')
+-v6*= looking for changes in 'test|main|source'...
+-v6*=  replacing './dists/test/main/source/Sources' (uncompressed,gzipped,script: rredtool)
+EOF
+dodo cp dists/test/main/source/Sources old/3
+dodo test -f dists/test/main/source/Sources.diff/Index
+
+(cd dists/test/main/source/Sources.diff/ && ls *.gz) | sort |sed -e 's/\.gz$//' > patches
+
+cat > results.expected <<EOF
+SHA1-Current: $(sha1andsize old/3)
+SHA1-History:
+EOF
+i=0
+for p in $(cat patches) ; do
+cat >> results.expected <<EOF
+ $(sha1and7size old/$i) ${p}
+EOF
+i=$((i+1))
+done
+cat >> results.expected <<EOF
+SHA1-Patches:
+EOF
+for p in $(cat patches) ; do
+	dodo gunzip dists/test/main/source/Sources.diff/${p}.gz
+cat >> results.expected <<EOF
+ $(sha1and7size dists/test/main/source/Sources.diff/${p}) ${p}
+EOF
+done
+cat >> results.expected <<EOF
+X-Patch-Precedence: merged
+EOF
+
+dodiff results.expected dists/test/main/source/Sources.diff/Index
+
+i=1
+for p in $(cat patches) ; do
+	cp dists/test/main/source/Sources.diff/$p $i.diff
+	i=$((i+1))
+done
+cat > results.expected << EOF
+1c
+Package: pre
+Format: 1.0
+Binary: pre
+Architecture: all
+Version: 3
+Maintainer: Guess Who <its@me>
+Priority: extra
+Section: pre
+Directory: pool/main/p/pre
+Files: 
+ $(mdandsize pre_3.dsc) pre_3.dsc
+ $(mdandsize pre_3.tar.gz) pre_3.tar.gz
+Checksums-Sha1: 
+ $(sha1andsize pre_3.dsc) pre_3.dsc
+ $(sha1andsize pre_3.tar.gz) pre_3.tar.gz
+Checksums-Sha256: 
+ $(sha2andsize pre_3.dsc) pre_3.dsc
+ $(sha2andsize pre_3.tar.gz) pre_3.tar.gz
+
+Package: test
+.
+EOF
+dodiff results.expected 1.diff
+rm 1.diff
+cat > results.expected << EOF
+17,18c
+ $(sha2andsize pre_3.dsc) pre_3.dsc
+ $(sha2andsize pre_3.tar.gz) pre_3.tar.gz
+.
+14,15c
+ $(sha1andsize pre_3.dsc) pre_3.dsc
+ $(sha1andsize pre_3.tar.gz) pre_3.tar.gz
+.
+11,12c
+ $(mdandsize pre_3.dsc) pre_3.dsc
+ $(mdandsize pre_3.tar.gz) pre_3.tar.gz
+.
+5c
+Version: 3
+.
+EOF
+dodiff results.expected 2.diff
+rm 2.diff
+dodiff results.expected 3.diff
+rm 3.diff
+cat > results.expected << EOF
+1c
+Package: pre
+.
+EOF
+dodiff results.expected 4.diff
+rm 4.diff
+
+rm -r old db pool conf dists pre_*.dsc pre_*.tar.gz test_1.dsc test_1.tar.gz  results.expected patches
+
+testsuccess