Skip to content

Commit 67b0f2f

Browse files
committed
ET#72674 connector-cpp/8.0.28: Change the way regression tests are handled on RPM platforms
Updating the cmake test options to create test files externally
1 parent 29af792 commit 67b0f2f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

packaging/mysql-connector-c++.spec.in

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,13 @@ to develop MySQL client applications in C++.
9999

100100
%{?gcc_toolset:source /opt/rh/%{gcc_toolset}/enable}
101101

102+
%if 0%{?with_tests:1} && 0%{?with_gtest:1}
103+
%global __cmake_test_opts -DWITH_TESTS=1 -DWITH_GTEST=%{with_gtest}
104+
%else
105+
%global __cmake_test_opts %{nil}
106+
%endif
102107
%global __cmake_explicit_opts -DCMAKE_INSTALL_PREFIX="%_prefix" -DCMAKE_C_FLAGS:STRING="%optflags" -DCMAKE_CXX_FLAGS:STRING="%optflags"
103-
%global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 -DWITH_JDBC=ON -DWITH_SSL=system %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
108+
%global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 -DWITH_JDBC=ON -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
104109
%global __cmake_cmd cmake%{?el6:3}%{?el7:3} %{__cmake_common_opts} %{__cmake_explicit_opts} ..
105110
mkdir build-dynamic && pushd build-dynamic
106111
pwd
@@ -155,7 +160,7 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
155160
%{_includedir}/mysql-cppconn-8/jdbc
156161

157162
%changelog
158-
* Mon Nov 08 2021 Gipson Pulla <[email protected]> - 8.0.28-1
163+
* Tue Nov 09 2021 Gipson Pulla <[email protected]> - 8.0.28-1
159164
- Removed the internal testing package
160165

161166
* Thu Jun 10 2021 Gipson Pulla <[email protected]> - 8.0.26-1

0 commit comments

Comments
 (0)