Accepting request 145658 from home:Andreas_Schwab:Factory

Split off glibc-testsuite package

OBS-URL: https://build.opensuse.org/request/show/145658
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=253

glibc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 17 11:16:49 UTC 2012 - schwab@suse.de
+
+- Split off glibc-testsuite package
+
 -------------------------------------------------------------------
 Fri Dec 14 19:31:45 UTC 2012 - aj@suse.de
 

glibc.spec

@@ -16,16 +16,18 @@
 #
 
 
-# The full testsuite is only run with osc --with=glibc_run_testsuite
+# PLEASE run pre_checkin.sh in this directory before submitting
-%bcond_with    glibc_run_testsuite
+# this package. Otherwise the .spec and .changes for glibc-testsuite
+# aren't updated.
+
 # Run with osc --with=fast_build to have a shorter turnaround
-# It will avoid building some parts of glibc and will not run the
+# It will avoid building some parts of glibc
-# testsuite
 %bcond_with    fast_build
 
 %define crypt_bf_version 1.2
 
 Name:           glibc
+%define testsuite_build ("%{name}" == "glibc-testsuite")
 Summary:        Standard Shared Libraries (from the GNU C Library)
 License:        LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
 Group:          System/Libraries
@@ -34,7 +36,7 @@ BuildRequires:  libselinux-devel
 BuildRequires:  makeinfo
 BuildRequires:  xz
 BuildRequires:  pkgconfig(systemd)
-%if %{with glibc_run_testsuite}
+%if %{testsuite_build}
 BuildRequires:  gcc-c++
 BuildRequires:  libstdc++-devel
 %endif
@@ -58,16 +60,6 @@ BuildRequires:  libstdc++-devel
 %define build_html 1
 %endif
 %endif
-# Enable testsuite runs for local builds
-%if %{with fast_build}
-%define run_testsuite 0
-%else
-%if %{with glibc_run_testsuite}
-%define run_testsuite 1
-%else
-%define run_testsuite 0
-%endif
-%endif
 
 %define disable_assert 0
 %define enable_stackguard_randomization 1
@@ -264,7 +256,6 @@ This package contains the documentation for the GNU C library stored as
 info files. Due to a lack of resources, this documentation is not
 complete and is partially out of date.
 
-%if %{build_html}
 %package html
 Summary:        HTML Documentation for the GNU C Library
 License:        GFDL-1.1
@@ -275,7 +266,6 @@ BuildArch:      noarch
 This package contains the HTML documentation for the GNU C library. Due
 to a lack of resources, this documentation is not complete and is
 partially out of date.
-%endif
 
 %package i18ndata
 Summary:        Database Sources for 'locale'
@@ -318,7 +308,6 @@ Requires:       glibc = %{version}
 Nscd caches name service lookups and can dramatically improve
 performance with NIS, NIS+, and LDAP.
 
-%if %{build_profile}
 %package profile
 Summary:        Libc Profiling and Debugging Versions
 License:        LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
@@ -335,7 +324,6 @@ Obsoletes:      glibc-profile-32bit
 %description profile
 This package contains special versions of the GNU C library which are
 necessary for profiling and debugging.
-%endif
 
 %package devel
 Summary:        Include Files and Libraries Mandatory for Development
@@ -397,8 +385,6 @@ are not essential but recommend to use.
 
 makedb: A program to create a database for nss
 
-%ifarch %ix86
-
 %package obsolete
 Summary:        Obsolete Shared Libraries from the GNU C Library
 License:        LGPL-2.0+
@@ -415,8 +401,6 @@ binaries working, but since this libraries are not supported and there
 is no gurantee that they work for you, you should try to get newer
 versions of your software.
 
-%endif
-
 %prep
 %setup -n glibc-%{version} -q -a 3 -a 4
 # Owl crypt_blowfish
@@ -497,9 +481,6 @@ find . -name configure | xargs touch
 #######################################################################
 
 %build
-%if %{with glibc_run_testsuite}
-echo glibc_run_testsuite is set
-%endif
 if [ -x /bin/uname.bin ]; then
 	/bin/uname.bin -a
 else
@@ -708,27 +689,23 @@ popd
 %check
 # The testsuite will fail if asneeded is used
 export SUSE_ASNEEDED=0
-%if %{run_testsuite}
+%if %{testsuite_build}
-	# Increase timeout
+# Increase timeout
-	export TIMEOUTFACTOR=16
+export TIMEOUTFACTOR=16
-	%ifarch alpha %ix86 ppc ppc64 ia64 s390 s390x x86_64
+%ifarch alpha %ix86 ppc ppc64 ia64 s390 s390x x86_64
 	# ix86: tst-cputimer? fails
 	# ia64: tst-timer4 fails
 	# ppc64: tst-pselect, ftwtest fails
 	# s390,s390x: tst-timer* fails
 	make %{?_smp_mflags} -C cc-base -k check || echo make check failed
-	%else
+%else
 	make %{?_smp_mflags} -C cc-base check
-	%endif
+%endif
 %endif
 # This has to pass on all platforms!
 # Exceptions:
 # None!
-#%ifnarch ppc
 make %{?_smp_mflags} -C cc-base check-abi
-#%else
-#make %{?_smp_mflags} -C cc-base check-abi || echo check-abi failed
-#%endif
 
 #######################################################################
 ###
@@ -737,6 +714,7 @@ make %{?_smp_mflags} -C cc-base check-abi
 #######################################################################
 
 %install
+%if !%{testsuite_build}
 # We don't want to strip the .symtab from our libraries in find-debuginfo.sh,
 # certainly not from libpthread.so.* because it is used by libthread_db to find
 # some non-exported symbols in order to detect if threading support
@@ -935,6 +913,7 @@ ln -s ld-%{glibc_major_version}.so %{buildroot}/lib/ld-linux.so.3
 # Move getconf to %{_libexecdir}/getconf/ to avoid cross device link
 mv %{buildroot}%{_bindir}/getconf %{buildroot}%{_libexecdir}/getconf/getconf
 ln -s %{_libexecdir}/getconf/getconf %{buildroot}%{_bindir}/getconf
+%endif # !%{testsuite_build}
 
 #######################################################################
 ###
@@ -995,6 +974,7 @@ exit 0
 %service_del_postun nscd.service
 exit 0
 
+%if !%{testsuite_build}
 %files
 #######################################################################
 ###
@@ -1264,4 +1244,6 @@ exit 0
 %{_bindir}/makedb
 /var/lib/misc/Makefile
 
+%endif # !%{testsuite_build}
+
 %changelog

pre_checkin.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# This script is called automatically during autobuild checkin.
+sed -e 's/^Name:.*glibc/&-testsuite/' glibc.spec > glibc-testsuite.spec
+cp glibc.changes glibc-testsuite.changes
+
+osc service localrun format_spec_file
+