Accepting request 149817 from home:Andreas_Schwab:Factory

- Don't run testsuite in parallel
- Fail if testsuite fails
- Disable crypt/badsalttest test

OBS-URL: https://build.opensuse.org/request/show/149817
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=264
This commit is contained in:
Andreas Schwab 2013-01-24 17:32:50 +00:00 committed by Git OBS Bridge
parent d56e5fb7b8
commit ed0235b5ba
7 changed files with 55 additions and 30 deletions

View File

@ -0,0 +1,16 @@
badsalttest expects that crypt fails for unknown salt, but crypt-blowfish
doesn't.
Index: glibc-2.17/crypt/Makefile
===================================================================
--- glibc-2.17.orig/crypt/Makefile
+++ glibc-2.17/crypt/Makefile
@@ -31,7 +31,7 @@ libcrypt-routines := crypt-entry md5-cry
libcrypt-routines += crypt_blowfish x86 crypt_gensalt wrapper
-tests := cert md5c-test sha256c-test sha512c-test badsalttest
+tests := cert md5c-test sha256c-test sha512c-test
include ../Makeconfig

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 24 16:33:04 UTC 2013 - schwab@suse.de
- Don't run testsuite in parallel
- Fail if testsuite fails
- Disable crypt/badsalttest test
-------------------------------------------------------------------
Tue Jan 8 09:53:38 UTC 2013 - coolo@suse.com

View File

@ -207,6 +207,8 @@ Patch18: glibc-cpusetsize.diff
Patch20: glibc-armhf-compat.patch
# PATCH-FIX-OPENSUSE Fix check abi for crypt additions
Patch21: glibc-fix-check-abi.patch
# PATCH-FIX-OPENSUSE Disable badsalttest which expects that crypt can fail
Patch22: glibc-crypt-badsalttest.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
@ -431,6 +433,7 @@ rm nscd/s-stamp
%patch15 -p1
%patch18 -p1
%patch21 -p1
%patch22 -p1
%patch100 -p1
%patch101 -p1
@ -687,25 +690,18 @@ popd
#######################################################################
%check
%if %{testsuite_build}
# The testsuite will fail if asneeded is used
export SUSE_ASNEEDED=0
%if %{testsuite_build}
# Increase timeout
export TIMEOUTFACTOR=16
%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
make -C cc-base -k check
%else
make %{?_smp_mflags} -C cc-base -k check
%endif
%endif
# This has to pass on all platforms!
# Exceptions:
# None!
make %{?_smp_mflags} -C cc-base check-abi
%endif
#######################################################################
###

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 24 16:33:04 UTC 2013 - schwab@suse.de
- Don't run testsuite in parallel
- Fail if testsuite fails
- Disable crypt/badsalttest test
-------------------------------------------------------------------
Tue Jan 8 09:53:38 UTC 2013 - coolo@suse.com

View File

@ -206,6 +206,8 @@ Patch18: glibc-cpusetsize.diff
Patch20: glibc-armhf-compat.patch
# PATCH-FIX-OPENSUSE Fix check abi for crypt additions
Patch21: glibc-fix-check-abi.patch
# PATCH-FIX-OPENSUSE Disable badsalttest which expects that crypt can fail
Patch22: glibc-crypt-badsalttest.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
@ -431,6 +433,7 @@ rm nscd/s-stamp
%patch15 -p1
%patch18 -p1
%patch21 -p1
%patch22 -p1
%patch100 -p1
%patch101 -p1
@ -687,25 +690,18 @@ popd
#######################################################################
%check
%if %{testsuite_build}
# The testsuite will fail if asneeded is used
export SUSE_ASNEEDED=0
%if %{testsuite_build}
# Increase timeout
export TIMEOUTFACTOR=16
%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
make -C cc-base -k check
%else
make %{?_smp_mflags} -C cc-base -k check
%endif
%endif
# This has to pass on all platforms!
# Exceptions:
# None!
make %{?_smp_mflags} -C cc-base check-abi
%endif
#######################################################################
###

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 24 16:33:04 UTC 2013 - schwab@suse.de
- Don't run testsuite in parallel
- Fail if testsuite fails
- Disable crypt/badsalttest test
-------------------------------------------------------------------
Tue Jan 8 09:53:38 UTC 2013 - coolo@suse.com

View File

@ -207,6 +207,8 @@ Patch18: glibc-cpusetsize.diff
Patch20: glibc-armhf-compat.patch
# PATCH-FIX-OPENSUSE Fix check abi for crypt additions
Patch21: glibc-fix-check-abi.patch
# PATCH-FIX-OPENSUSE Disable badsalttest which expects that crypt can fail
Patch22: glibc-crypt-badsalttest.patch
### Locale related patches
# PATCH-FIX-OPENSUSE Add additional locales
@ -431,6 +433,7 @@ rm nscd/s-stamp
%patch15 -p1
%patch18 -p1
%patch21 -p1
%patch22 -p1
%patch100 -p1
%patch101 -p1
@ -687,25 +690,18 @@ popd
#######################################################################
%check
%if %{testsuite_build}
# The testsuite will fail if asneeded is used
export SUSE_ASNEEDED=0
%if %{testsuite_build}
# Increase timeout
export TIMEOUTFACTOR=16
%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
make -C cc-base -k check
%else
make %{?_smp_mflags} -C cc-base -k check
%endif
%endif
# This has to pass on all platforms!
# Exceptions:
# None!
make %{?_smp_mflags} -C cc-base check-abi
%endif
#######################################################################
###