[PATCH 3/4] Add missing tests input files to distribution files
Dodji Seketeli
dodji@redhat.com
Sun Jan 1 00:00:00 GMT 2017
Hello Chenxiong,
The runtestfedabipkgdiff.py test was missing some input files from the
source distribution.
This patch adds them back.
Also, the test file name
test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
was too long for tar to handle so that file was left out of the final
source distribution tarball. This patch renames that file to a
smaller name.
make distcheck should pass again now.
* tests/data/Makefile.am: Add three missing test input files to
the source distribution tarball. Renamed
test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
into
test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt.
* tests/runtestfedabipkgdiff.py.in (FEDABIPKGDIFF_TEST_SPECS):
Renamed
test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
into
test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
tests/data/Makefile.am | 3 ++
...4--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt | 51 ----------------------
...4--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt | 51 ++++++++++++++++++++++
tests/runtestfedabipkgdiff.py.in | 4 +-
4 files changed, 56 insertions(+), 53 deletions(-)
delete mode 100644 tests/data/test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
create mode 100644 tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index d224e5e..7a13b89 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1257,6 +1257,9 @@ test-fedabipkgdiff/test0-from-fc20-to-fc23-dbus-glib-report-0.txt \
test-fedabipkgdiff/test1-from-fc20-to-dbus-glib-0.106-1.fc23.x86_64-report-0.txt \
test-fedabipkgdiff/test2-dbus-glib-0.100.2-2.fc20--dbus-glib-0.106-1.fc23-report-0.txt \
test-fedabipkgdiff/test3-dbus-glib-0.100.2-2.fc20.i686--dbus-glib-0.106-1.fc23.i686-report-0.txt \
+test-fedabipkgdiff/test4-glib-0.100.2-2.fc20.x86_64.rpm-glib-0.106-1.fc23.x86_64.rpm-report-0.txt \
+test-fedabipkgdiff/test5-same-dir-dbus-glib-0.100.2-2.fc20.x86_64--dbus-glib-0.106-1.fc23.x86_64-report-0.txt \
+test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt \
test-fedabipkgdiff/packages/dbus-glib/0.100.2/2.fc20/i686/dbus-glib-0.100.2-2.fc20.i686.rpm \
test-fedabipkgdiff/packages/dbus-glib/0.100.2/2.fc20/i686/dbus-glib-debuginfo-0.100.2-2.fc20.i686.rpm \
test-fedabipkgdiff/packages/dbus-glib/0.100.2/2.fc20/i686/dbus-glib-devel-0.100.2-2.fc20.i686.rpm \
diff --git a/tests/data/test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
deleted file mode 100644
index b3ee911..0000000
--- a/tests/data/test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Comparing the ABI of binaries between nss-util-3.12.6-1.fc14.x86_64.rpm and nss-util-3.24.0-2.0.fc25.x86_64.rpm:
-
-================ changes of 'libnssutil3.so'===============
- Functions changes summary: 0 Removed, 0 Changed, 0 Added function
- Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
- Function symbols changes summary: 0 Removed, 37 Added function symbols not referenced by debug info
- Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referenced by debug info
-
- 37 Added function symbols not referenced by debug info:
-
- NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
- NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
- NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
- NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
- NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
- NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
- NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
- NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
- NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
- NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
- NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
- NSSUTIL_ArgReadLong@@NSSUTIL_3.14
- NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
- NSSUTIL_ArgStrip@@NSSUTIL_3.14
- NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
- NSSUTIL_DoubleEscape@@NSSUTIL_3.14
- NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
- NSSUTIL_Escape@@NSSUTIL_3.14
- NSSUTIL_EscapeSize@@NSSUTIL_3.14
- NSSUTIL_GetVersion@@NSSUTIL_3.13
- NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
- NSSUTIL_MkNSSString@@NSSUTIL_3.14
- NSSUTIL_MkSlotString@@NSSUTIL_3.14
- NSSUTIL_Quote@@NSSUTIL_3.14
- NSSUTIL_QuoteSize@@NSSUTIL_3.14
- NSS_InitializePRErrorTable@@NSSUTIL_3.13
- PORT_DestroyCheapArena@@NSSUTIL_3.24
- PORT_InitCheapArena@@NSSUTIL_3.24
- PORT_RegExpSearch@@NSSUTIL_3.12.7
- SECITEM_AllocArray@@NSSUTIL_3.15
- SECITEM_DupArray@@NSSUTIL_3.15
- SECITEM_FreeArray@@NSSUTIL_3.15
- SECITEM_ReallocItemV2@@NSSUTIL_3.15
- SECITEM_ZfreeArray@@NSSUTIL_3.15
- _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
- _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
- _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
-
-================ end of changes of 'libnssutil3.so'===============
-
-
diff --git a/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
new file mode 100644
index 0000000..b3ee911
--- /dev/null
+++ b/tests/data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt
@@ -0,0 +1,51 @@
+Comparing the ABI of binaries between nss-util-3.12.6-1.fc14.x86_64.rpm and nss-util-3.24.0-2.0.fc25.x86_64.rpm:
+
+================ changes of 'libnssutil3.so'===============
+ Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
+ Function symbols changes summary: 0 Removed, 37 Added function symbols not referenced by debug info
+ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referenced by debug info
+
+ 37 Added function symbols not referenced by debug info:
+
+ NSSUTIL_ArgDecodeNumber@@NSSUTIL_3.14
+ NSSUTIL_ArgFetchValue@@NSSUTIL_3.14
+ NSSUTIL_ArgGetLabel@@NSSUTIL_3.14
+ NSSUTIL_ArgGetParamValue@@NSSUTIL_3.14
+ NSSUTIL_ArgHasFlag@@NSSUTIL_3.14
+ NSSUTIL_ArgIsBlank@@NSSUTIL_3.14
+ NSSUTIL_ArgParseCipherFlags@@NSSUTIL_3.14
+ NSSUTIL_ArgParseModuleSpec@@NSSUTIL_3.14
+ NSSUTIL_ArgParseModuleSpecEx@@NSSUTIL_3.21
+ NSSUTIL_ArgParseSlotFlags@@NSSUTIL_3.14
+ NSSUTIL_ArgParseSlotInfo@@NSSUTIL_3.14
+ NSSUTIL_ArgReadLong@@NSSUTIL_3.14
+ NSSUTIL_ArgSkipParameter@@NSSUTIL_3.14
+ NSSUTIL_ArgStrip@@NSSUTIL_3.14
+ NSSUTIL_DoModuleDBFunction@@NSSUTIL_3.14
+ NSSUTIL_DoubleEscape@@NSSUTIL_3.14
+ NSSUTIL_DoubleEscapeSize@@NSSUTIL_3.14
+ NSSUTIL_Escape@@NSSUTIL_3.14
+ NSSUTIL_EscapeSize@@NSSUTIL_3.14
+ NSSUTIL_GetVersion@@NSSUTIL_3.13
+ NSSUTIL_MkModuleSpec@@NSSUTIL_3.14
+ NSSUTIL_MkNSSString@@NSSUTIL_3.14
+ NSSUTIL_MkSlotString@@NSSUTIL_3.14
+ NSSUTIL_Quote@@NSSUTIL_3.14
+ NSSUTIL_QuoteSize@@NSSUTIL_3.14
+ NSS_InitializePRErrorTable@@NSSUTIL_3.13
+ PORT_DestroyCheapArena@@NSSUTIL_3.24
+ PORT_InitCheapArena@@NSSUTIL_3.24
+ PORT_RegExpSearch@@NSSUTIL_3.12.7
+ SECITEM_AllocArray@@NSSUTIL_3.15
+ SECITEM_DupArray@@NSSUTIL_3.15
+ SECITEM_FreeArray@@NSSUTIL_3.15
+ SECITEM_ReallocItemV2@@NSSUTIL_3.15
+ SECITEM_ZfreeArray@@NSSUTIL_3.15
+ _NSSUTIL_EvaluateConfigDir@@NSSUTIL_3.14
+ _NSSUTIL_GetSecmodName@@NSSUTIL_3.14
+ _SGN_VerifyPKCS1DigestInfo@@NSSUTIL_3.17.1
+
+================ end of changes of 'libnssutil3.so'===============
+
+
diff --git a/tests/runtestfedabipkgdiff.py.in b/tests/runtestfedabipkgdiff.py.in
index 15676a1..777c8f9 100755
--- a/tests/runtestfedabipkgdiff.py.in
+++ b/tests/runtestfedabipkgdiff.py.in
@@ -85,8 +85,8 @@ FEDABIPKGDIFF_TEST_SPECS = [
([os.path.join(INPUT_DIR, 'nss-util/nss-util-3.12.6-1.fc14.x86_64.rpm'),
os.path.join(INPUT_DIR, 'nss-util/nss-util-3.24.0-2.0.fc25.x86_64.rpm')],
- 'data/test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt',
- 'output/test-fedabipkgdiff/test6-missing-devel-debuginfo-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt'),
+ 'data/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt',
+ 'output/test-fedabipkgdiff/test6-nss-util-3.12.6-1.fc14.x86_64--nss-util-3.24.0-2.0.fc25.x86_64-report-0.txt'),
]
--
1.8.3.1
--
Dodji
More information about the Libabigail
mailing list