From a4dd13b46775e989a15582fd6bc104b252ac27e1 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 23 Dec 2021 10:59:29 -0800 Subject: [PATCH 1/4] Update to 2021.12.20.00; enable tests Signed-off-by: Michel Alexandre Salim --- sources | 2 +- wangle-disable_failed_tests.patch | 33 +++++++++++++++++++++++++++++++ wangle.spec | 25 ++++++++++++++--------- 3 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 wangle-disable_failed_tests.patch diff --git a/sources b/sources index ba6889a..3a616ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2021.11.29.00.tar.gz) = 8af2b3794831e17d087bd7e229f58626ef850b3099a3b01783f119ad41a5fc530749310c8a49fc509b9e18533f50d44cdabb94cb6ceabf49049e3fbbb6b59593 +SHA512 (wangle-2021.12.20.00.tar.gz) = 38c484fbbef3a84407a1c9c54e655c5990bea9e5888d98d40f35453f793536ee768619c99faa0b4583c3d4ec4e19eae764f6d9d1f9909a8105424a7895a8def9 diff --git a/wangle-disable_failed_tests.patch b/wangle-disable_failed_tests.patch new file mode 100644 index 0000000..576c2bf --- /dev/null +++ b/wangle-disable_failed_tests.patch @@ -0,0 +1,33 @@ +diff -ruN wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp wangle-disable_failed_tests/wangle/bootstrap/test/BootstrapTest.cpp +--- wangle-2021.12.20.00/wangle/bootstrap/test/BootstrapTest.cpp 2021-12-19 19:29:28.000000000 -0800 ++++ wangle-disable_failed_tests/wangle/bootstrap/test/BootstrapTest.cpp 2021-12-23 12:04:07.412647589 -0800 +@@ -353,6 +353,7 @@ + server.bind(0); + } + ++/* fine on mock, failed on Koji + TEST(Bootstrap, UDPClientServerTest) { + connections = 0; + +@@ -382,6 +383,7 @@ + + EXPECT_EQ(connections, 1); + } ++*/ + + TEST(Bootstrap, UnixServer) { + TestServer server; +diff -ruN wangle-2021.12.20.00/wangle/CMakeLists.txt wangle-disable_failed_tests/wangle/CMakeLists.txt +--- wangle-2021.12.20.00/wangle/CMakeLists.txt 2021-12-19 19:29:28.000000000 -0800 ++++ wangle-disable_failed_tests/wangle/CMakeLists.txt 2021-12-23 12:01:23.779810003 -0800 +@@ -295,7 +295,9 @@ + # add_gtest(service/test/ServiceTest.cpp ServiceTest) + # this test requires arguments? + # add_gtest(ssl/test/SSLCacheTest.cpp SSLCacheTest) +- add_gtest(ssl/test/SSLContextManagerTest.cpp SSLContextManagerTest) ++ # this test fails against the packaged folly ++ # E1223 11:17:23.030416 2602 SSLContextManager.cpp:491] error loading client CA folly/io/async/test/certs/client_chain.pem: std::runtime_error: SSL_CTX_load_verify_locations: SSL error # 80000002; no such file; system lib ++ # add_gtest(ssl/test/SSLContextManagerTest.cpp SSLContextManagerTest) + add_gtest(ssl/test/TLSCredProcessorTest.cpp TLSCredProcessorTest) + add_gtest(util/test/FilePollerTest.cpp FilePollerTest) + endif() diff --git a/wangle.spec b/wangle.spec index 84fa492..a5c2edc 100644 --- a/wangle.spec +++ b/wangle.spec @@ -7,21 +7,20 @@ %endif # Tests are not currently passing -%bcond_with tests +%bcond_without tests %global _static_builddir static_build -# Use C++20 standard, required for folly coroutines. -%global build_cxxflags -std=c++20 %{optflags} - Name: wangle -Version: 2021.11.29.00 +Version: 2021.12.20.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way License: ASL 2.0 URL: https://github.com/facebook/wangle Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# disable failing tests, see patch for context +Patch0: %{name}-disable_failed_tests.patch # Folly is known not to work on big-endian CPUs # https://bugzilla.redhat.com/show_bug.cgi?id=1892807 @@ -36,19 +35,26 @@ BuildRequires: folly-devel BuildRequires: fizz-static BuildRequires: folly-static %endif +%if %{with tests} +BuildRequires: gmock-devel +BuildRequires: gtest-devel +%endif -%description + +%global _description %{expand: Wangle is a library that makes it easy to build protocols, application clients, and application servers. -It's like Netty + Finagle smooshed together, but in C++. +It's like Netty + Finagle smooshed together, but in C++.} + +%description %{_description} %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel +%description devel %{_description} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -58,7 +64,8 @@ developing applications that use %{name}. Summary: Static development libraries for %{name} Requires: %{name}-devel%{?_isa} = %{version}-%{release} -%description static +%description static %{_description} + The %{name}-static package contains static libraries for developing applications that use %{name}. %endif From 1126f55849a59db823b98df70e04393ce68c778a Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 18 Jan 2022 17:15:18 -0800 Subject: [PATCH 2/4] Update to 2022.01.17.00 Signed-off-by: Michel Alexandre Salim --- sources | 2 +- wangle.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3a616ec..4f49df1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2021.12.20.00.tar.gz) = 38c484fbbef3a84407a1c9c54e655c5990bea9e5888d98d40f35453f793536ee768619c99faa0b4583c3d4ec4e19eae764f6d9d1f9909a8105424a7895a8def9 +SHA512 (wangle-2022.01.17.00.tar.gz) = 6da923659d372a0e9dce061c0b9278d53476dc64ba61a6d5edd015a851cb257208966294104f8f8cf875a2db4c65b8335c122a5894ba3cbba3573154cca8df95 diff --git a/wangle.spec b/wangle.spec index a5c2edc..0256c26 100644 --- a/wangle.spec +++ b/wangle.spec @@ -12,7 +12,7 @@ %global _static_builddir static_build Name: wangle -Version: 2021.12.20.00 +Version: 2022.01.17.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way From 86a137069812979d70197cd8903558785b900132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:15:47 +0000 Subject: [PATCH 3/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 02f18ed9a0cbd1b3f8b38cbcffc2c484892ef55f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Wed, 23 Feb 2022 15:53:40 -0800 Subject: [PATCH 4/4] Update to 2022.02.21.00 (resolves: rhbz#2035820) Signed-off-by: Michel Alexandre Salim --- sources | 2 +- wangle.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 4f49df1..8cd1afc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wangle-2022.01.17.00.tar.gz) = 6da923659d372a0e9dce061c0b9278d53476dc64ba61a6d5edd015a851cb257208966294104f8f8cf875a2db4c65b8335c122a5894ba3cbba3573154cca8df95 +SHA512 (wangle-2022.02.21.00.tar.gz) = ce3a85b203afebc5d339fbda6828fcaae341b34f1865aa7e482e548caaac55f9856627479f2c39e3371c4cee32f62ff42cdd7f55abc3544bb3baf6d2260f4f92 diff --git a/wangle.spec b/wangle.spec index 0256c26..eeabeca 100644 --- a/wangle.spec +++ b/wangle.spec @@ -12,7 +12,7 @@ %global _static_builddir static_build Name: wangle -Version: 2022.01.17.00 +Version: 2022.02.21.00 Release: %autorelease Summary: Framework for building services in a consistent/modular/composable way @@ -29,11 +29,11 @@ ExcludeArch: s390x BuildRequires: cmake BuildRequires: gcc-c++ # Library dependencies -BuildRequires: fizz-devel -BuildRequires: folly-devel +BuildRequires: fizz-devel = %{version} +BuildRequires: folly-devel = %{version} %if %{with static} -BuildRequires: fizz-static -BuildRequires: folly-static +BuildRequires: fizz-static = %{version} +BuildRequires: folly-static = %{version} %endif %if %{with tests} BuildRequires: gmock-devel