[main] Fixing `cmake` tests and restoring generation of its debug symbols. (#1750)

SPECS/cmake/cmake.spec

@@ -2,7 +2,7 @@
 Summary:        Cmake
 Name:           cmake
 Version:        3.21.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD AND LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -44,18 +44,13 @@ operating system and in a compiler-independent manner.
 %autosetup -p1
 
 %build
-# Disable symbol generation
-export CFLAGS="`echo " %{build_cflags} " | sed 's/ -g//'`"
-export CXXFLAGS="`echo " %{build_cxxflags} " | sed 's/ -g//'`"
-
-ncores="$(%{_bindir}/getconf _NPROCESSORS_ONLN)"
 ./bootstrap \
     --prefix=%{_prefix} \
     --system-expat \
     --system-zlib \
     --system-libarchive \
     --system-bzip2 \
-    --parallel=$ncores
+    --parallel=$(nproc)
 %make_build
 
 %install
@@ -65,7 +60,11 @@ install -Dpm0644 %{SOURCE1} %{buildroot}%{_libdir}/rpm/macros.d/macros.cmake
 sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{_libdir}/rpm/macros.d/macros.cmake
 
 %check
-%make_build test
+# Removing static libraries to fix issues with the "ParseImplicitLinkInfo" test runs for the "craype-C-Cray-8.7.input" and "craype-CXX-Cray-8.7.input" inputs.
+# Should be removed once the issue is fixed upstream and we apply the fix: https://gitlab.kitware.com/cmake/cmake/-/issues/22470.
+rm -f %{_lib64dir}/lib{stdc++,gfortran}.a
+
+bin/ctest --force-new-ctest-process --rerun-failed --output-on-failure
 
 %files
 %defattr(-,root,root)
@@ -80,6 +79,11 @@ sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{majo
 %{_prefix}/doc/%{name}-*/*
 
 %changelog
+* Sun Dec 12 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.21.4-2
+- Adding a workaround for two failing "ParseImplicitLinkInfo" test cases until a fix is available.
+- Adjusted test command to re-run flaky tests.
+- Bringing back generation of debug symbols.
+
 * Mon Nov 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.21.4-1
 - Update to version 3.21.4.
 - License verified.

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -24,8 +24,8 @@ ca-certificates-shared-20200720-20.cm2.noarch.rpm
 ca-certificates-tools-20200720-20.cm2.noarch.rpm
 check-0.15.2-1.cm2.aarch64.rpm
 check-debuginfo-0.15.2-1.cm2.aarch64.rpm
-cmake-3.21.4-1.cm2.aarch64.rpm
-cmake-debuginfo-3.21.4-1.cm2.aarch64.rpm
+cmake-3.21.4-2.cm2.aarch64.rpm
+cmake-debuginfo-3.21.4-2.cm2.aarch64.rpm
 coreutils-8.32-1.cm2.aarch64.rpm
 coreutils-debuginfo-8.32-1.cm2.aarch64.rpm
 coreutils-lang-8.32-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -24,8 +24,8 @@ ca-certificates-shared-20200720-20.cm2.noarch.rpm
 ca-certificates-tools-20200720-20.cm2.noarch.rpm
 check-0.15.2-1.cm2.x86_64.rpm
 check-debuginfo-0.15.2-1.cm2.x86_64.rpm
-cmake-3.21.4-1.cm2.x86_64.rpm
-cmake-debuginfo-3.21.4-1.cm2.x86_64.rpm
+cmake-3.21.4-2.cm2.x86_64.rpm
+cmake-debuginfo-3.21.4-2.cm2.x86_64.rpm
 coreutils-8.32-1.cm2.x86_64.rpm
 coreutils-debuginfo-8.32-1.cm2.x86_64.rpm
 coreutils-lang-8.32-1.cm2.x86_64.rpm