2017-10-04 00:19:51 +02:00
|
|
|
From 4d4549d686febaa531a0f2eef8cc0aa745ef1300 Mon Sep 17 00:00:00 2001
|
2017-10-03 05:16:40 +02:00
|
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
|
|
Date: Fri, 21 Jul 2017 12:47:39 +0100
|
|
|
|
|
Subject: [PATCH] io: fix temp directory used by test-io-channel-tls test
|
|
|
|
|
|
|
|
|
|
The test-io-channel-tls test was mistakenly using two of the
|
|
|
|
|
same directories as test-crypto-tlssession. This causes a
|
|
|
|
|
sporadic failure when using make -j$BIGNUM.
|
|
|
|
|
|
|
|
|
|
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
|
(cherry picked from commit d4adf9675801cd90e66ecfcd6a54ca1abc5a6698)
|
|
|
|
|
[BR: We're getting failures in qemu-testsuite. This fix either resolves
|
|
|
|
|
that failure, or has been identified as being a qemu-testsuite failure
|
|
|
|
|
fix in related code]
|
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
|
|
|
---
|
|
|
|
|
tests/test-io-channel-tls.c | 4 ++--
|
|
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
|
|
|
|
|
index 8eaa208e1b..ff96877323 100644
|
|
|
|
|
--- a/tests/test-io-channel-tls.c
|
|
|
|
|
+++ b/tests/test-io-channel-tls.c
|
|
|
|
|
@@ -127,8 +127,8 @@ static void test_io_channel_tls(const void *opaque)
|
|
|
|
|
/* We'll use this for our fake client-server connection */
|
|
|
|
|
g_assert(socketpair(AF_UNIX, SOCK_STREAM, 0, channel) == 0);
|
|
|
|
|
|
|
|
|
|
-#define CLIENT_CERT_DIR "tests/test-crypto-tlssession-client/"
|
|
|
|
|
-#define SERVER_CERT_DIR "tests/test-crypto-tlssession-server/"
|
|
|
|
|
+#define CLIENT_CERT_DIR "tests/test-io-channel-tls-client/"
|
|
|
|
|
+#define SERVER_CERT_DIR "tests/test-io-channel-tls-server/"
|
|
|
|
|
mkdir(CLIENT_CERT_DIR, 0700);
|
|
|
|
|
mkdir(SERVER_CERT_DIR, 0700);
|
|
|
|
|
|
