|
 |
7711c0 |
From 1764efd987a39de271eac2e5bc9900f29819f6f0 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Wed, 27 Mar 2019 17:22:14 +0100
|
|
|
7711c0 |
Subject: [PATCH 075/163] iotests: Skip 233 if certtool not installed
|
|
|
7711c0 |
MIME-Version: 1.0
|
|
|
7711c0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7711c0 |
Content-Transfer-Encoding: 8bit
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190327172308.31077-2-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 85176
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 01/55] iotests: Skip 233 if certtool not installed
|
|
|
7711c0 |
Bugzilla: 1691009
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
The use of TLS while building qemu is optional. While the
|
|
|
7711c0 |
'certtool' binary should be available on every platform that
|
|
|
7711c0 |
supports building against TLS, that does not imply that the
|
|
|
7711c0 |
developer has installed it. Make the test gracefully skip
|
|
|
7711c0 |
in that case.
|
|
|
7711c0 |
|
|
|
7711c0 |
Reported-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 155af09d44f584a790118f78448f50f140d0f788)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
tests/qemu-iotests/common.tls | 3 +++
|
|
|
7711c0 |
1 file changed, 3 insertions(+)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/tests/qemu-iotests/common.tls b/tests/qemu-iotests/common.tls
|
|
|
7711c0 |
index 39f17c1..eae8178 100644
|
|
|
7711c0 |
--- a/tests/qemu-iotests/common.tls
|
|
|
7711c0 |
+++ b/tests/qemu-iotests/common.tls
|
|
|
7711c0 |
@@ -31,6 +31,9 @@ tls_x509_cleanup()
|
|
|
7711c0 |
|
|
|
7711c0 |
tls_x509_init()
|
|
|
7711c0 |
{
|
|
|
7711c0 |
+ (certtool --help) >/dev/null 2>&1 || \
|
|
|
7711c0 |
+ _notrun "certtool utility not found, skipping test"
|
|
|
7711c0 |
+
|
|
|
7711c0 |
mkdir -p "${tls_dir}"
|
|
|
7711c0 |
|
|
|
7711c0 |
# use a fixed key so we don't waste system entropy on
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|