From a9e4b9e292df22e7c632f0865b33cc4908a6b36e Mon Sep 17 00:00:00 2001 From: eaglegai Date: Thu, 9 Jun 2022 15:25:15 +0800 Subject: [PATCH] enable test (cherry picked from commit c715a25a4e6e4d530443a3fed7157405f3a2ffa1) --- backport-disable-live-tests.patch | 26 ++++++++++++++++++++++++++ c-ares.spec | 17 ++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 backport-disable-live-tests.patch diff --git a/backport-disable-live-tests.patch b/backport-disable-live-tests.patch new file mode 100644 index 0000000..6314e0e --- /dev/null +++ b/backport-disable-live-tests.patch @@ -0,0 +1,26 @@ +Conflict:NA +Reference:https://build.opensuse.org/package/view_file/openSUSE:Factory/c-ares/disable-live-tests.patch?expand=1 +From 5b3d9a337dbf0cf990ebc5639c950e092de86539 Mon Sep 17 00:00:00 2001 +From: chengyechun +Date: Tue, 8 Feb 2022 19:57:57 +0800 +Subject: [PATCH] disable live test + +--- + test/Makefile.inc | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/Makefile.inc b/test/Makefile.inc +index 820afdb..c625a68 100644 +--- a/test/Makefile.inc ++++ b/test/Makefile.inc +@@ -16,7 +16,6 @@ TESTSOURCES = ares-test-main.cc \ + ares-test-parse-txt.cc \ + ares-test-parse-uri.cc \ + ares-test-misc.cc \ +- ares-test-live.cc \ + ares-test-mock.cc \ + ares-test-mock-ai.cc \ + ares-test-internal.cc \ +-- +1.8.3.1 + diff --git a/c-ares.spec b/c-ares.spec index 7398077..de0adbb 100644 --- a/c-ares.spec +++ b/c-ares.spec @@ -1,15 +1,16 @@ Name: c-ares Version: 1.18.1 -Release: 2 +Release: 3 Summary: A C library for asynchronous DNS requests License: MIT URL: https://github.com/c-ares/c-ares Source0: https://github.com/c-ares/c-ares/releases/download/cares-1_18_1/%{name}-%{version}.tar.gz -BuildRequires: gcc autoconf automake libtool +BuildRequires: gcc autoconf automake libtool g++ # Patch0 from Redhat is applied for stopping overriding AC_CONFIG_MACRO_DIR -Patch0: 0000-Use-RPM-compiler-options.patch +Patch0: 0000-Use-RPM-compiler-options.patch +Patch1: backport-disable-live-tests.patch %description This is c-ares, an asynchronous resolver library. It is intended for applications @@ -38,6 +39,10 @@ make %{?_smp_mflags} %delete_la %ldconfig_scriptlets +%check +%make_build -C test +./test/arestest + %files %doc CHANGES LICENSE.md %{_libdir}/*.so.* @@ -53,6 +58,12 @@ make %{?_smp_mflags} %{_mandir}/man3/* %changelog +* Thu Jun 09 2022 gaihuiying - 1.18.1-3 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:enable test + * Mon Apr 18 2022 quanhongfei - 1.18.1-2 - Type:bugfix - Id:NA -- Gitee