Accepting request 541990 from home:Andreas_Schwab:Factory

- Support --without=testsuite and disable testsuite for qemu-linux-user
  builds

OBS-URL: https://build.opensuse.org/request/show/541990
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gdb?expand=0&rev=175
This commit is contained in:
Michael Matz 2017-11-15 12:32:21 +00:00 committed by Git OBS Bridge
parent 0fd48e79d5
commit feefab9860
2 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 15 08:54:04 UTC 2017 - schwab@suse.de
- Support --without=testsuite and disable testsuite for qemu-linux-user
builds
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 25 12:14:54 UTC 2017 - jmatejek@suse.com Wed Oct 25 12:14:54 UTC 2017 - jmatejek@suse.com

View File

@ -17,7 +17,10 @@
# #
%define _with_testsuite 1 %if 0%{?qemu_user_space_build}
%global _without_testsuite 1
%endif
%bcond_without testsuite
Summary: A GNU source-level debugger for C, C++, Fortran and other languages Summary: A GNU source-level debugger for C, C++, Fortran and other languages
License: GPL-3.0+ and GPL-3.0-with-GCC-exception and LGPL-2.1+ and LGPL-3.0+ License: GPL-3.0+ and GPL-3.0-with-GCC-exception and LGPL-2.1+ and LGPL-3.0+
@ -328,7 +331,7 @@ BuildRequires: cmake
ExclusiveArch: noarch i386 x86_64 ppc ppc64 ia64 s390 s390x ExclusiveArch: noarch i386 x86_64 ppc ppc64 ia64 s390 s390x
%endif # 0%{?el5:1} %endif # 0%{?el5:1}
%if 0%{?_with_testsuite:1} %if %{with testsuite}
# Ensure the devel libraries are installed for both multilib arches. # Ensure the devel libraries are installed for both multilib arches.
%global bits_local %{?_isa} %global bits_local %{?_isa}
@ -384,7 +387,7 @@ BuildRequires: glibc-devel-static-32bit
BuildRequires: glibc-devel-static BuildRequires: glibc-devel-static
%endif %endif
%endif # 0%{?_with_testsuite:1} %endif # %{with testsuite}
%ifarch ia64 %ifarch ia64
BuildRequires: libunwind-devel BuildRequires: libunwind-devel
@ -868,7 +871,7 @@ cp $RPM_BUILD_DIR/%{gdb_src}/gdb/NEWS $RPM_BUILD_DIR/%{gdb_src}
# Initially we're in the %{gdb_src} directory. # Initially we're in the %{gdb_src} directory.
cd %{gdb_build} cd %{gdb_build}
%if 0%{!?_with_testsuite:1} %if %{without testsuite}
echo ====================TESTSUITE DISABLED========================= echo ====================TESTSUITE DISABLED=========================
%else %else
echo ====================TESTING========================= echo ====================TESTING=========================
@ -1133,7 +1136,7 @@ fi
%endif %endif
%endif %endif
%if 0%{?_with_testsuite:1} %if %{with testsuite}
%files testresults %files testresults
%defattr(-,root,root) %defattr(-,root,root)
%doc %{gdb_build}/gdb/gdb-*.sum %doc %{gdb_build}/gdb/gdb-*.sum