From: Stefano Garzarella <sgarzare@redhat.com>
To: netdev@vger.kernel.org
Cc: kvm@vger.kernel.org, Stefan Hajnoczi <stefanha@redhat.com>,
Dexuan Cui <decui@microsoft.com>,
virtualization@lists.linux-foundation.org,
"David S. Miller" <davem@davemloft.net>,
Jorgen Hansen <jhansen@vmware.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 09/11] vsock_test: add --transport parameter
Date: Thu, 1 Aug 2019 17:25:39 +0200 [thread overview]
Message-ID: <20190801152541.245833-10-sgarzare@redhat.com> (raw)
In-Reply-To: <20190801152541.245833-1-sgarzare@redhat.com>
Add new --transport parameter to skip some tests or checks
not supported by a specific transport.
Suggested-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
tools/testing/vsock/util.h | 8 ++++++++
tools/testing/vsock/vsock_test.c | 20 +++++++++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
index 379e02ab59bb..7fdb8100f035 100644
--- a/tools/testing/vsock/util.h
+++ b/tools/testing/vsock/util.h
@@ -12,9 +12,17 @@ enum test_mode {
TEST_MODE_SERVER
};
+enum test_transport {
+ TEST_TRANSPORT_UNSET,
+ TEST_TRANSPORT_VMCI,
+ TEST_TRANSPORT_VIRTIO,
+ TEST_TRANSPORT_HYPERV
+};
+
/* Test runner options */
struct test_opts {
enum test_mode mode;
+ enum test_transport transport;
unsigned int peer_cid;
};
diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
index 06099d037405..cb606091489f 100644
--- a/tools/testing/vsock/vsock_test.c
+++ b/tools/testing/vsock/vsock_test.c
@@ -218,6 +218,11 @@ static const struct option longopts[] = {
.has_arg = required_argument,
.val = 'p',
},
+ {
+ .name = "transport",
+ .has_arg = required_argument,
+ .val = 't',
+ },
{
.name = "help",
.has_arg = no_argument,
@@ -228,7 +233,7 @@ static const struct option longopts[] = {
static void usage(void)
{
- fprintf(stderr, "Usage: vsock_test [--help] [--control-host=<host>] --control-port=<port> --mode=client|server --peer-cid=<cid>\n"
+ fprintf(stderr, "Usage: vsock_test [--help] [--control-host=<host>] --control-port=<port> --mode=client|server --peer-cid=<cid> [--transport=vmci|virtio|hyperv]\n"
"\n"
" Server: vsock_test --control-port=1234 --mode=server --peer-cid=3\n"
" Client: vsock_test --control-host=192.168.0.1 --control-port=1234 --mode=client --peer-cid=2\n"
@@ -252,6 +257,7 @@ int main(int argc, char **argv)
const char *control_port = NULL;
struct test_opts opts = {
.mode = TEST_MODE_UNSET,
+ .transport = TEST_TRANSPORT_UNSET,
.peer_cid = VMADDR_CID_ANY,
};
@@ -283,6 +289,18 @@ int main(int argc, char **argv)
case 'P':
control_port = optarg;
break;
+ case 't':
+ if (strcmp(optarg, "vmci") == 0)
+ opts.transport = TEST_TRANSPORT_VMCI;
+ else if (strcmp(optarg, "virtio") == 0)
+ opts.transport = TEST_TRANSPORT_VIRTIO;
+ else if (strcmp(optarg, "hyperv") == 0)
+ opts.transport = TEST_TRANSPORT_HYPERV;
+ else {
+ fprintf(stderr, "--transport must be \"vmci\" or \"virtio\" or \"hyperv\"\n");
+ return EXIT_FAILURE;
+ }
+ break;
case '?':
default:
usage();
--
2.20.1
next prev parent reply other threads:[~2019-08-01 15:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 15:25 [PATCH v2 00/11] VSOCK: add vsock_test test suite Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 01/11] VSOCK: fix header include in vsock_diag_test Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 02/11] VSOCK: add SPDX identifiers to vsock tests Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 03/11] VSOCK: extract utility functions from vsock_diag_test.c Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 04/11] VSOCK: extract connect/accept " Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 05/11] VSOCK: add full barrier between test cases Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 06/11] VSOCK: add send_byte()/recv_byte() test utilities Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 07/11] VSOCK: add AF_VSOCK test cases Stefano Garzarella
2019-10-09 10:03 ` Stefano Garzarella
2019-10-09 15:15 ` Stefan Hajnoczi
2019-10-10 8:47 ` Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 08/11] VSOCK: add vsock_get_local_cid() test utility Stefano Garzarella
2019-08-01 15:25 ` Stefano Garzarella [this message]
2019-08-01 15:25 ` [PATCH v2 10/11] vsock_test: skip read() in test_stream*close tests on a VMCI host Stefano Garzarella
2019-08-01 15:53 ` Sergei Shtylyov
2019-08-01 15:58 ` Stefano Garzarella
2019-08-20 8:32 ` Stefan Hajnoczi
2019-08-22 10:08 ` Stefano Garzarella
2019-08-01 15:25 ` [PATCH v2 11/11] vsock_test: wait for the remote to close the connection Stefano Garzarella
2019-08-20 8:28 ` Stefan Hajnoczi
2019-08-22 9:15 ` Stefano Garzarella
2019-08-23 10:09 ` Stefan Hajnoczi
2019-08-01 16:16 ` [PATCH v2 00/11] VSOCK: add vsock_test test suite Dexuan Cui
2019-08-02 7:55 ` Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190801152541.245833-10-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=jhansen@vmware.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).