From ed0235b5baf30403aae32db0ca5205ba434d1b16a9808cd5df4f46192a4da4d2 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 24 Jan 2013 17:32:50 +0000 Subject: [PATCH] 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 --- glibc-crypt-badsalttest.patch | 16 ++++++++++++++++ glibc-testsuite.changes | 7 +++++++ glibc-testsuite.spec | 16 ++++++---------- glibc-utils.changes | 7 +++++++ glibc-utils.spec | 16 ++++++---------- glibc.changes | 7 +++++++ glibc.spec | 16 ++++++---------- 7 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 glibc-crypt-badsalttest.patch diff --git a/glibc-crypt-badsalttest.patch b/glibc-crypt-badsalttest.patch new file mode 100644 index 0000000..faa9ef3 --- /dev/null +++ b/glibc-crypt-badsalttest.patch @@ -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 + diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index 90e5ccc..66dc1e4 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -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 diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index 88733e0..708b15e 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -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 ####################################################################### ### diff --git a/glibc-utils.changes b/glibc-utils.changes index 90e5ccc..66dc1e4 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -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 diff --git a/glibc-utils.spec b/glibc-utils.spec index 163f8c8..16cfc55 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -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 ####################################################################### ### diff --git a/glibc.changes b/glibc.changes index 90e5ccc..66dc1e4 100644 --- a/glibc.changes +++ b/glibc.changes @@ -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 diff --git a/glibc.spec b/glibc.spec index 6d35a12..0eb0dae 100644 --- a/glibc.spec +++ b/glibc.spec @@ -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 ####################################################################### ###