819c4cae43
- repl-server-test.patch: fix race in 00-repl-server.test OBS-URL: https://build.opensuse.org/request/show/439339 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=84
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
|
|
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 <rlb@defaultvalue.org>.
|
|
|
|
* 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
|
|
|