Hello community, here is the log from the commit of package guile for openSUSE:Factory checked in at 2016-11-11 14:30:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile (Old) and /work/SRC/openSUSE:Factory/.guile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile" Changes: -------- --- /work/SRC/openSUSE:Factory/guile/guile.changes 2016-10-20 23:06:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.guile.new/guile.changes 2016-11-11 14:31:00.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 8 11:14:02 UTC 2016 - [email protected] + +- repl-server-test.patch: fix race in 00-repl-server.test + +------------------------------------------------------------------- New: ---- repl-server-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile.spec ++++++ --- /var/tmp/diff_new_pack.zuuSj2/_old 2016-11-11 14:31:01.000000000 +0100 +++ /var/tmp/diff_new_pack.zuuSj2/_new 2016-11-11 14:31:01.000000000 +0100 @@ -41,6 +41,7 @@ Patch2: %{name}-1.6.10-mktemp.patch Patch3: %{name}-threads-test.patch Patch4: %{name}-net-db-test.patch +Patch5: repl-server-test.patch BuildRequires: gc-devel BuildRequires: gmp-devel BuildRequires: libffi-devel @@ -122,6 +123,7 @@ %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # force rebuild with non-broken makeinfo #rm -f doc/*/*.info ++++++ repl-server-test.patch ++++++ >From 2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <[email protected]> Date: Fri, 4 Nov 2016 22:45:51 +0100 Subject: [PATCH] tests: Avoid race condition in REPL server test. Fixes <http://bugs.gnu.org/24769>. Reported by Rob Browning <[email protected]>. * test-suite/tests/00-repl-server.test ("simple expression"): Add call to 'select' before 'display'. --- test-suite/tests/00-repl-server.test | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test-suite/tests/00-repl-server.test b/test-suite/tests/00-repl-server.test index 1f570a9601..4b5ec0cb38 100644 --- a/test-suite/tests/00-repl-server.test +++ b/test-suite/tests/00-repl-server.test @@ -105,8 +105,14 @@ reached." "scheme@(repl-server)> $1 = 42\n" (with-repl-server socket (read-until-prompt socket %last-line-before-prompt) - (display "(+ 40 2)\n(quit)\n" socket) - (read-string socket))) + + ;; Wait until 'repl-reader' in boot-9 has written the prompt. + ;; Otherwise, if we write too quickly, 'repl-reader' checks for + ;; 'char-ready?' and doesn't print the prompt. + (match (select (list socket) '() (list socket) 3) + (((_) () ()) + (display "(+ 40 2)\n(quit)\n" socket) + (read-string socket))))) (pass-if "HTTP inter-protocol attack" ;CVE-2016-8606 (with-repl-server socket -- 2.10.2
