Fix check tests for json-c, libmodulemd, libpwquality (#405)

* fix tests

* update manifests

* fix typo

SPECS/json-c/json-c.spec

@@ -1,7 +1,7 @@
 Summary:        A JSON implementation in C
 Name:           json-c
 Version:        0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Group:          System Environment/Base
 Vendor:         Microsoft Corporation
@@ -42,7 +42,8 @@ make DESTDIR=%{buildroot} install -C build
 rm -r %{buildroot}%{_libdir}/cmake/%{name}
 
 %check
-make %{?_smp_mflags} check -C build
+cd build/tests
+make %{?_smp_mflags} test
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -59,6 +60,8 @@ make %{?_smp_mflags} check -C build
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+*   Thu Nov 19 2020 Andrew Phelps <anphel@microsoft.com> 0.14-3
+-   Fix check tests
 *   Tue Aug 04 2020 Henry Beberman <henry.beberman@microsoft.com> 0.14-2
 -   Add a patch to fix a bug introduced by CVE-2020-12762.patch
 *   Mon Jun 08 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 0.14-1

SPECS/libmodulemd/libmodulemd.spec

@@ -3,7 +3,7 @@
 Summary:        Module manipulating metadata files
 Name:           libmodulemd
 Version:        2.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MIT
 URL:            https://github.com/fedora-modularity/libmodulemd
 Source0:        https://github.com/fedora-modularity/libmodulemd/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz
@@ -43,6 +43,7 @@ cd api1
 ninja
 
 %check
+export LC_CTYPE=C.utf8
 cd api1
 ninja test
 
@@ -69,6 +70,8 @@ DESTDIR=%{buildroot}/ ninja install
 %{_includedir}/modulemd/*
 
 %changelog
+*   Thu Nov 19 2020 Andrew Phelps <anphel@microsoft.com> 2.5.0-4
+-   Fix check test.
 *   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.5.0-3
 -   Added %%license line automatically
 *   Tue Apr 07 2020 Nicolas Ontiveros <niontive@microsoft.com> 2.5.0-2

SPECS/libpwquality/libpwquality.spec

@@ -3,7 +3,7 @@
 Summary:       A library for password generation and password quality checking
 Name:          libpwquality
 Version:       1.4.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 Vendor:        Microsoft Corporation
 Distribution:  Mariner
 URL:           https://github.com/libpwquality/libpwquality/
@@ -84,9 +84,6 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d
 
 %find_lang libpwquality
 
-%check
-# Nothing yet
-
 %ldconfig_scriptlets
 
 %files -f libpwquality.lang
@@ -114,6 +111,9 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d
 %{python3_sitearch}/*.egg-info
 
 %changelog
+* Thu Nov 19 2020 Andrew Phelps <anphel@microsoft.com> 1.4.2-5
+- Remove empty check section.
+
 * Mon Jun 29 2020 Paul Monson <paulmon@microsoft.com> 1.4.2-4
 - Only create python3 symbolic link if /usr/bin/python3 does not exist.
 

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -140,9 +140,9 @@ gzip-debuginfo-1.9-5.cm1.aarch64.rpm
 integritysetup-2.3.3-2.cm1.aarch64.rpm
 intltool-0.51.0-7.cm1.noarch.rpm
 itstool-2.0.6-3.cm1.noarch.rpm
-json-c-0.14-2.cm1.aarch64.rpm
-json-c-debuginfo-0.14-2.cm1.aarch64.rpm
-json-c-devel-0.14-2.cm1.aarch64.rpm
+json-c-0.14-3.cm1.aarch64.rpm
+json-c-debuginfo-0.14-3.cm1.aarch64.rpm
+json-c-devel-0.14-3.cm1.aarch64.rpm
 kbd-2.0.4-5.cm1.aarch64.rpm
 kbd-debuginfo-2.0.4-5.cm1.aarch64.rpm
 kernel-headers-5.4.72-1.cm1.noarch.rpm
@@ -192,9 +192,9 @@ libmpc-debuginfo-1.1.0-5.cm1.aarch64.rpm
 libpipeline-1.5.0-3.cm1.aarch64.rpm
 libpipeline-debuginfo-1.5.0-3.cm1.aarch64.rpm
 libpipeline-devel-1.5.0-3.cm1.aarch64.rpm
-libpwquality-1.4.2-4.cm1.aarch64.rpm
-libpwquality-debuginfo-1.4.2-4.cm1.aarch64.rpm
-libpwquality-devel-1.4.2-4.cm1.aarch64.rpm
+libpwquality-1.4.2-5.cm1.aarch64.rpm
+libpwquality-debuginfo-1.4.2-5.cm1.aarch64.rpm
+libpwquality-devel-1.4.2-5.cm1.aarch64.rpm
 libselinux-2.9-3.cm1.aarch64.rpm
 libselinux-debuginfo-2.9-3.cm1.aarch64.rpm
 libselinux-devel-2.9-3.cm1.aarch64.rpm
@@ -325,7 +325,7 @@ python2-tools-2.7.18-5.cm1.aarch64.rpm
 python3-cracklib-2.9.7-2.cm1.aarch64.rpm
 python3-gpg-1.13.1-6.cm1.aarch64.rpm
 python3-libxml2-2.9.10-3.cm1.aarch64.rpm
-python3-pwquality-1.4.2-4.cm1.aarch64.rpm
+python3-pwquality-1.4.2-5.cm1.aarch64.rpm
 python3-rpm-4.14.2-10.cm1.aarch64.rpm
 python-curses-2.7.18-5.cm1.aarch64.rpm
 python-gpg-1.13.1-6.cm1.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -140,9 +140,9 @@ gzip-debuginfo-1.9-5.cm1.x86_64.rpm
 integritysetup-2.3.3-2.cm1.x86_64.rpm
 intltool-0.51.0-7.cm1.noarch.rpm
 itstool-2.0.6-3.cm1.noarch.rpm
-json-c-0.14-2.cm1.x86_64.rpm
-json-c-debuginfo-0.14-2.cm1.x86_64.rpm
-json-c-devel-0.14-2.cm1.x86_64.rpm
+json-c-0.14-3.cm1.x86_64.rpm
+json-c-debuginfo-0.14-3.cm1.x86_64.rpm
+json-c-devel-0.14-3.cm1.x86_64.rpm
 kbd-2.0.4-5.cm1.x86_64.rpm
 kbd-debuginfo-2.0.4-5.cm1.x86_64.rpm
 kernel-headers-5.4.72-1.cm1.noarch.rpm
@@ -192,9 +192,9 @@ libmpc-debuginfo-1.1.0-5.cm1.x86_64.rpm
 libpipeline-1.5.0-3.cm1.x86_64.rpm
 libpipeline-debuginfo-1.5.0-3.cm1.x86_64.rpm
 libpipeline-devel-1.5.0-3.cm1.x86_64.rpm
-libpwquality-1.4.2-4.cm1.x86_64.rpm
-libpwquality-debuginfo-1.4.2-4.cm1.x86_64.rpm
-libpwquality-devel-1.4.2-4.cm1.x86_64.rpm
+libpwquality-1.4.2-5.cm1.x86_64.rpm
+libpwquality-debuginfo-1.4.2-5.cm1.x86_64.rpm
+libpwquality-devel-1.4.2-5.cm1.x86_64.rpm
 libselinux-2.9-3.cm1.x86_64.rpm
 libselinux-debuginfo-2.9-3.cm1.x86_64.rpm
 libselinux-devel-2.9-3.cm1.x86_64.rpm
@@ -325,7 +325,7 @@ python2-tools-2.7.18-5.cm1.x86_64.rpm
 python3-cracklib-2.9.7-2.cm1.x86_64.rpm
 python3-gpg-1.13.1-6.cm1.x86_64.rpm
 python3-libxml2-2.9.10-3.cm1.x86_64.rpm
-python3-pwquality-1.4.2-4.cm1.x86_64.rpm
+python3-pwquality-1.4.2-5.cm1.x86_64.rpm
 python3-rpm-4.14.2-10.cm1.x86_64.rpm
 python-curses-2.7.18-5.cm1.x86_64.rpm
 python-gpg-1.13.1-6.cm1.x86_64.rpm