tests: Test --run + --tls + $uri + $tls

Test the previous two commits.

Author: rwmjones

tests/Makefile.am

@@ -216,6 +216,7 @@ TESTS += \
 	test-single-from-file.sh \
 	test-single-sh.sh \
 	test-captive.sh \
+	test-captive-tls.sh \
 	test-random-sock.sh \
 	test-tls.sh \
 	test-tls-psk.sh \
@@ -237,6 +238,7 @@ TESTS += \
 endif
 EXTRA_DIST += \
 	test-captive.sh \
+	test-captive-tls.sh \
 	test-ddrescue-filter.sh \
 	test-debug-flags.sh \
 	test-dump-plugin-and-single.sh \

tests/test-captive-tls.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# nbdkit
+# Copyright (C) 2014-2021 Red Hat Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of Red Hat nor the names of its contributors may be
+# used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+# Test nbdkit --run (captive nbdkit) + --tls option + $uri + $tls
+# shell variables.
+#
+# In nbdkit < 1.26 the $uri shell variable was not constructed
+# correctly.
+#
+# Also in nbdkit < 1.26 there was no $tls shell variable.
+
+source ./functions.sh
+set -e
+set -x
+
+requires_run
+requires nbdinfo --version
+
+# XXX Check that libnbd was built with TLS support.
+
+# Does the nbdkit binary support TLS?
+if ! nbdkit --dump-config | grep -sq tls=yes; then
+    echo "$0: nbdkit built without TLS support"
+    exit 77
+fi
+
+# Did we create the PKI files?
+# Probably 'certtool' is missing.
+pkidir="$PWD/pki"
+if [ ! -f "$pkidir/ca-cert.pem" ]; then
+    echo "$0: PKI files were not created by the test harness"
+    exit 77
+fi
+
+out=test-captive-tls.out
+cleanup_fn rm -f $out
+rm -f $out
+
+LANG=C \
+nbdkit -U - --tls=require --tls-certificates="$pkidir" \
+       -D nbdkit.tls.session=1 \
+       null \
+       --run '[ "x$tls" = "x2" ] && nbdinfo "$uri"' > $out
+grep "newstyle-fixed with TLS" $out