Adding upstream version 1.21.22.upstream/1.21.22upstream

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

8 files changed, 64 insertions, 0 deletions

diff --git a/tests/t-file-replaces/Makefile b/tests/t-file-replaces/Makefile
new file mode 100644
index 0000000..6c67d75
--- /dev/null
+++ b/tests/t-file-replaces/Makefile
@@ -0,0 +1,44 @@
+TESTS_DEB := pkg-file-original pkg-file-takeover
+
+include ../Test.mk
+
+TEST_CASES += test-two-run-ordered
+TEST_CASES += test-one-run-ordered
+TEST_CASES += test-two-run-reverse
+TEST_CASES += test-one-run-reverse
+
+test-case: $(TEST_CASES)
+
+define VERIFY
+$(call pkg_is_installed,pkg-file-original)
+$(call pkg_is_installed,pkg-file-takeover)
+test "`$(DPKG_QUERY) -S /test-file`" = "pkg-file-takeover: /test-file"
+cmp ref-file "$(DPKG_INSTDIR)/test-file"
+endef
+
+test-two-run-ordered:
+	# test-two-run-ordered
+	$(DPKG_INSTALL) pkg-file-original.deb
+	$(DPKG_INSTALL) pkg-file-takeover.deb
+	$(VERIFY)
+	$(DPKG_PURGE) pkg-file-original pkg-file-takeover
+
+test-one-run-ordered:
+	# test-one-run-ordered
+	$(DPKG_INSTALL) pkg-file-original.deb pkg-file-takeover.deb
+	$(VERIFY)
+	$(DPKG_PURGE) pkg-file-original pkg-file-takeover
+
+test-two-run-reverse:
+	# test-two-run-reverse
+	$(DPKG_INSTALL) pkg-file-takeover.deb
+	$(DPKG_INSTALL) pkg-file-original.deb
+	$(VERIFY)
+	$(DPKG_PURGE) pkg-file-original pkg-file-takeover
+
+test-one-run-reverse:
+	# test-one-run-reverse
+	$(DPKG_INSTALL) pkg-file-takeover.deb pkg-file-original.deb
+	$(VERIFY)
+	$(DPKG_PURGE) pkg-file-original pkg-file-takeover
+
diff --git a/tests/t-file-replaces/pkg-file-original/DEBIAN/control b/tests/t-file-replaces/pkg-file-original/DEBIAN/control
new file mode 100644
index 0000000..305534f
--- /dev/null
+++ b/tests/t-file-replaces/pkg-file-original/DEBIAN/control
@@ -0,0 +1,8 @@
+Package: pkg-file-original
+Version: 0
+Section: test
+Priority: extra
+Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+Architecture: all
+Description: test package - provide a file
+
diff --git a/tests/t-file-replaces/pkg-file-original/test-file b/tests/t-file-replaces/pkg-file-original/test-file
new file mode 100644
index 0000000..7e3c47b
--- /dev/null
+++ b/tests/t-file-replaces/pkg-file-original/test-file
@@ -0,0 +1 @@
+test original
diff --git a/tests/t-file-replaces/pkg-file-original/test-original b/tests/t-file-replaces/pkg-file-original/test-original
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/t-file-replaces/pkg-file-original/test-original
diff --git a/tests/t-file-replaces/pkg-file-takeover/DEBIAN/control b/tests/t-file-replaces/pkg-file-takeover/DEBIAN/control
new file mode 100644
index 0000000..6af91c8
--- /dev/null
+++ b/tests/t-file-replaces/pkg-file-takeover/DEBIAN/control
@@ -0,0 +1,9 @@
+Package: pkg-file-takeover
+Version: 0
+Section: test
+Priority: extra
+Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+Architecture: all
+Replaces: pkg-file-original
+Description: test package - file replaces takeover
+
diff --git a/tests/t-file-replaces/pkg-file-takeover/test-file b/tests/t-file-replaces/pkg-file-takeover/test-file
new file mode 100644
index 0000000..82fe7fe
--- /dev/null
+++ b/tests/t-file-replaces/pkg-file-takeover/test-file
@@ -0,0 +1 @@
+test takeover
diff --git a/tests/t-file-replaces/pkg-file-takeover/test-takeover b/tests/t-file-replaces/pkg-file-takeover/test-takeover
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/t-file-replaces/pkg-file-takeover/test-takeover
diff --git a/tests/t-file-replaces/ref-file b/tests/t-file-replaces/ref-file
new file mode 100644
index 0000000..82fe7fe
--- /dev/null
+++ b/tests/t-file-replaces/ref-file
@@ -0,0 +1 @@
+test takeover