Fix tests for llvm and libaio (#475)

* fix libaio tests

* fix llvm tests

* update manifests

SPECS/libaio/libaio.spec

@@ -1,14 +1,18 @@
-Summary:	Linux-native asynchronous I/O access library
-Name:		libaio
-Version:    0.3.112
-Release:    2%{?dist}
-License:	LGPLv2+
-Group:		System Environment/Libraries
+Summary:        Linux-native asynchronous I/O access library
+Name:           libaio
+Version:        0.3.112
+Release:        3%{?dist}
+License:        LGPLv2+
+Group:          System Environment/Libraries
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-URL:        https://pagure.io/libaio
-Source0:    https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
-Patch0:		libaio-install-to-destdir-slash-usr.patch
+URL:            https://pagure.io/libaio
+Source0:        https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
+Patch0:         libaio-install-to-destdir-slash-usr.patch
+
+%if %{with_check}
+BuildRequires:  e2fsprogs-devel
+%endif
 
 %description
 The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a
@@ -18,12 +22,12 @@ The POSIX async I/O facility requires this library in order to provide
 kernel-accelerated async I/O capabilities, as do applications which
 require the Linux-native async I/O API.
 
-%package	devel
-Summary:	Development files for Linux-native asynchronous I/O access
-Group:		Development/System
-Requires:	libaio
+%package    devel
+Summary:    Development files for Linux-native asynchronous I/O access
+Group:      Development/System
+Requires:   libaio
 
-%description	devel
+%description devel
 This package provides header files to include and libraries to link with
 for the Linux-native asynchronous I/O facility ("async I/O", or "aio").
 
@@ -67,14 +71,15 @@ make %{?_smp_mflags} -k check
 %attr(0755,root,root) %{_libdir}/libaio.a
 
 %changelog
-* Sat May 09 00:21:40 PST 2020 Nick Samson <nisamson@microsoft.com> - 0.3.112-2
-- Added %%license line automatically
-
+*   Thu Dec 17 2020 Andrew Phelps <anphel@microsoft.com> 0.3-112-3
+-   Add e2fsprogs-devel to fix check test.
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 0.3.112-2
+-   Added %%license line automatically
 *   Tue Mar 17 2020 Henry Beberman <henry.beberman@microsoft.com> 0.3.112-1
 -   Update to 0.3.112. Fix Source0 URL. Fix URL. Update Patch0. License verified.
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 0.3.110-3
 -   Initial CBL-Mariner import from Photon (license: Apache2).
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.3.110-2
--	GA - Bump release of all rpms
-* Tue Mar 3 2015 Divya Thaluru <dthaluru@vmware.com> 0.3.110-1
-- Initial version
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.3.110-2
+-   GA - Bump release of all rpms
+*   Tue Mar 3 2015 Divya Thaluru <dthaluru@vmware.com> 0.3.110-1
+-   Initial version

SPECS/llvm/llvm.spec

@@ -1,18 +1,24 @@
 Summary:        A collection of modular and reusable compiler and toolchain technologies.
 Name:           llvm
 Version:        8.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        NCSA
 URL:            https://llvm.org/
 Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz
 Group:          Development/Tools
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+
 BuildRequires:  cmake
 BuildRequires:  libxml2-devel
 BuildRequires:  libffi-devel
 BuildRequires:  python2
 BuildRequires:  ninja-build
+
+%if %{with_check}
+BuildRequires:  python-xml
+%endif
+
 Requires:       libxml2
 
 %description
@@ -42,6 +48,8 @@ cmake -G Ninja                              \
       -DCMAKE_BUILD_TYPE=Release            \
       -DLLVM_PARALLEL_LINK_JOBS=1           \
       -DLLVM_BUILD_LLVM_DYLIB=ON            \
+      -DLLVM_INCLUDE_TESTS=ON               \
+      -DLLVM_BUILD_TESTS=ON                 \
       -DLLVM_TARGETS_TO_BUILD="host;AMDGPU;BPF" \
       -DLLVM_INCLUDE_GO_TESTS=No            \
       -Wno-dev ..
@@ -59,7 +67,7 @@ cmake -G Ninja                              \
 # disable security hardening for tests
 rm -f $(dirname $(gcc -print-libgcc-file-name))/../specs
 cd build
-make %{?_smp_mflags} check-llvm
+ninja check-all
 
 %clean
 rm -rf %{buildroot}/*
@@ -85,6 +93,8 @@ rm -rf %{buildroot}/*
 %{_includedir}/*
 
 %changelog
+*   Thu Dec 17 2020 Andrew Phelps <anphel@microsoft.com> - 8.0.1-4
+-   Enable tests in build and run test with ninja.
 *   Fri Jun 12 2020 Henry Beberman <henry.beberman@microsoft.com> - 8.0.1-3
 -   Switch to ninja-build to use LLVM_PARALLEL_LINK_JOBS=1 to reduce
 -   fatal OOM errors during linking phase.

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -153,9 +153,9 @@ krb5-1.17-4.cm1.aarch64.rpm
 krb5-debuginfo-1.17-4.cm1.aarch64.rpm
 krb5-devel-1.17-4.cm1.aarch64.rpm
 krb5-lang-1.17-4.cm1.aarch64.rpm
-libaio-0.3.112-2.cm1.aarch64.rpm
-libaio-debuginfo-0.3.112-2.cm1.aarch64.rpm
-libaio-devel-0.3.112-2.cm1.aarch64.rpm
+libaio-0.3.112-3.cm1.aarch64.rpm
+libaio-debuginfo-0.3.112-3.cm1.aarch64.rpm
+libaio-devel-0.3.112-3.cm1.aarch64.rpm
 libarchive-3.4.2-3.cm1.aarch64.rpm
 libarchive-debuginfo-3.4.2-3.cm1.aarch64.rpm
 libarchive-devel-3.4.2-3.cm1.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -153,9 +153,9 @@ krb5-1.17-4.cm1.x86_64.rpm
 krb5-debuginfo-1.17-4.cm1.x86_64.rpm
 krb5-devel-1.17-4.cm1.x86_64.rpm
 krb5-lang-1.17-4.cm1.x86_64.rpm
-libaio-0.3.112-2.cm1.x86_64.rpm
-libaio-debuginfo-0.3.112-2.cm1.x86_64.rpm
-libaio-devel-0.3.112-2.cm1.x86_64.rpm
+libaio-0.3.112-3.cm1.x86_64.rpm
+libaio-debuginfo-0.3.112-3.cm1.x86_64.rpm
+libaio-devel-0.3.112-3.cm1.x86_64.rpm
 libarchive-3.4.2-3.cm1.x86_64.rpm
 libarchive-debuginfo-3.4.2-3.cm1.x86_64.rpm
 libarchive-devel-3.4.2-3.cm1.x86_64.rpm