From e54191eac90fd6f0dac7d7080a097c89e6d0a987 Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Tue, 9 Apr 2019 10:35:42 +0200 Subject: [PATCH] Add test for the fix for PR24410 PR24410 was fixed by these recent commits: 1b83138 Propagate private type diff category through refs/qualified type diffs dc84fee Fix anonymous union constructed under the wrong context 522ac25 Internal pretty repr of union cannot be flat representation But then I forgot to add a regression test for that issue. This patch does that. * tests/data/test-diff-pkg/PR24410-new/poppler-debuginfo-0.73.0-8.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-new/poppler-qt5-0.73.0-8.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-new/poppler-qt5-debuginfo-0.73.0-8.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-new/poppler-qt5-devel-0.73.0-8.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-old/poppler-debuginfo-0.73.0-4.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-old/poppler-qt5-0.73.0-4.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-old/poppler-qt5-debuginfo-0.73.0-4.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-old/poppler-qt5-devel-0.73.0-4.fc30.x86_64.rpm: Add new test input. * tests/data/test-diff-pkg/PR24410-report-0.txt: Add new test input. * tests/data/Makefile.am: Add the test input above to source distribution. * tests/test-diff-pkg.cc: Make this test harness use the new input rpms above. Signed-off-by: Dodji Seketeli --- tests/data/Makefile.am | 9 +++++++++ tests/test-diff-pkg.cc | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 0debab90..ab447442 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -1463,6 +1463,15 @@ test-diff-pkg/netcdf-fortran-mpich-debuginfo-4.4.4-11.fc30.x86_64.rpm \ test-diff-pkg/netcdf-fortran-mpich-devel-4.4.4-10.fc29.x86_64.rpm \ test-diff-pkg/netcdf-fortran-mpich-devel-4.4.4-11.fc30.x86_64.rpm \ test-diff-pkg/netcdf-fortran-mpich-4.4.4-10.fc29.x86_64-4.4.4-11.fc30.x86_64-report-0.txt \ +test-diff-pkg/PR24410-new/poppler-debuginfo-0.73.0-8.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-new/poppler-qt5-0.73.0-8.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-new/poppler-qt5-debuginfo-0.73.0-8.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-new/poppler-qt5-devel-0.73.0-8.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-old/poppler-debuginfo-0.73.0-4.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-old/poppler-qt5-0.73.0-4.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-old/poppler-qt5-debuginfo-0.73.0-4.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-old/poppler-qt5-devel-0.73.0-4.fc30.x86_64.rpm \ +test-diff-pkg/PR24410-report-0.txt \ \ test-fedabipkgdiff/dbus-glib-0.104-3.fc23.x86_64.rpm \ test-fedabipkgdiff/dbus-glib-debuginfo-0.104-3.fc23.x86_64.rpm \ diff --git a/tests/test-diff-pkg.cc b/tests/test-diff-pkg.cc index 403d1e8b..59ef7d66 100644 --- a/tests/test-diff-pkg.cc +++ b/tests/test-diff-pkg.cc @@ -591,6 +591,20 @@ static InOutSpec in_out_specs[] = "data/test-diff-pkg/netcdf-fortran-mpich-4.4.4-10.fc29.x86_64-4.4.4-11.fc30.x86_64-report-0.txt", "output/test-diff-pkg/netcdf-fortran-mpich-4.4.4-10.fc29.x86_64-4.4.4-11.fc30.x86_64-report-0.txt" }, + { + "data/test-diff-pkg/PR24410-old/poppler-qt5-0.73.0-4.fc30.x86_64.rpm", + "data/test-diff-pkg/PR24410-new/poppler-qt5-0.73.0-8.fc30.x86_64.rpm", + "--fail-no-dbg", + "", + "data/test-diff-pkg/PR24410-old/poppler-debuginfo-0.73.0-4.fc30.x86_64.rpm, " + "data/test-diff-pkg/PR24410-old/poppler-qt5-debuginfo-0.73.0-4.fc30.x86_64.rpm", + "data/test-diff-pkg/PR24410-new/poppler-debuginfo-0.73.0-8.fc30.x86_64.rpm, " + "data/test-diff-pkg/PR24410-new/poppler-qt5-debuginfo-0.73.0-8.fc30.x86_64.rpm", + "data/test-diff-pkg/PR24410-old/poppler-qt5-devel-0.73.0-4.fc30.x86_64.rpm", + "data/test-diff-pkg/PR24410-new/poppler-qt5-devel-0.73.0-8.fc30.x86_64.rpm", + "data/test-diff-pkg/PR24410-report-0.txt", + "output/test-diff-pkg/PR24410-report-0.txt" + }, #endif //WITH_RPM #ifdef WITH_DEB -- 2.43.5