Some minimal user land executables to run tests and to enable/disable coverage: ktfrun: Simple generic test runner for generic ktf tests ktftest: A test runner for the ktf selftests. Contains code to configure specific selftest context objects. ktfcov: A utility to selectively enable coverage support for a kernel module. Coverage support can also be enabled in code by tests, if desired. hybrun: A test that implements a hybrid test runner. hybrid.cc: User mode part of the hybrid_self ktfrun.cc: Generic user level application to run kernel tests Signed-off-by: Knut Omang <knut.omang@xxxxxxxxxx> --- tools/testing/selftests/ktf/user/Makefile | 26 ++++++++- tools/testing/selftests/ktf/user/hybrid.cc | 39 +++++++++++++- tools/testing/selftests/ktf/user/ktfcov.cc | 68 ++++++++++++++++++++++- tools/testing/selftests/ktf/user/ktfrun.cc | 20 ++++++- tools/testing/selftests/ktf/user/ktftest.cc | 46 +++++++++++++++- 5 files changed, 199 insertions(+) create mode 100644 tools/testing/selftests/ktf/user/Makefile create mode 100644 tools/testing/selftests/ktf/user/hybrid.cc create mode 100644 tools/testing/selftests/ktf/user/ktfcov.cc create mode 100644 tools/testing/selftests/ktf/user/ktfrun.cc create mode 100644 tools/testing/selftests/ktf/user/ktftest.cc diff --git a/tools/testing/selftests/ktf/user/Makefile b/tools/testing/selftests/ktf/user/Makefile new file mode 100644 index 0000000..04c8e7e --- /dev/null +++ b/tools/testing/selftests/ktf/user/Makefile @@ -0,0 +1,26 @@ + +GTEST_CFLAGS ?= -I$(GTEST_PATH)/include -DGTEST_HAS_PTHREAD=1 -lpthread +GTEST_LIBS ?= -L$(GTEST_PATH)/lib64 -lgtest -lpthread +NETLINK_CFLAGS ?= $(shell pkgconf --cflags libnl-genl-3.0) +HOST_EXTRACFLAGS = -I$(srctree)/$(src)/../lib $(NETLINK_CFLAGS) $(GTEST_CFLAGS) \ + -Wall -Werror \ + -Wno-packed-bitfield-compat -D_GNU_SOURCE + +HOST_EXTRACXXFLAGS = -I$(srctree)/$(src)/../lib $(NETLINK_CFLAGS) $(GTEST_CFLAGS) \ + -Wall \ + -Wno-packed-bitfield-compat \ + -Wno-pointer-arith -Werror \ + -D__FILENAME__=\"`basename $<`\" +NETLINK_LIBS ?= $(shell pkgconf --libs libnl-genl-3.0) +KBUILD_HOSTLDLIBS = -L$(obj)/../lib -lktf $(NETLINK_LIBS) $(GTEST_LIBS) + +hostprogs-y := ktfrun ktfcov ktftest + +__build: $(addprefix $(obj)/,$(hostprogs-y)) + +## Simple kernel test runner sample program: +ktfrun-cxxobjs = ktfrun.o +ktfcov-cxxobjs = ktfcov.o + +## Configure and run the KTF selftests: +ktftest-cxxobjs = ktftest.o hybrid.o diff --git a/tools/testing/selftests/ktf/user/hybrid.cc b/tools/testing/selftests/ktf/user/hybrid.cc new file mode 100644 index 0000000..6aa5ad2 --- /dev/null +++ b/tools/testing/selftests/ktf/user/hybrid.cc @@ -0,0 +1,39 @@ +/* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Author: Knut Omang <knut.omang@xxxxxxxxxx> + * + * SPDX-License-Identifier: GPL-2.0 + * + * hybrid.cpp: User mode part of the hybrid_self + * test in selftests + */ + +#include "ktf.h" +#include <string.h> + +extern "C" { +#include "../selftest/hybrid_self.h" +} + +/* User side of a simple hybrid test that just sends an out-of-band message + * to the kernel side - the kernel implementation picks it up and verifies + * that it is the expected string and integer values. + * + * This form of test allows the mixing of normal gtest user land assertions + * with one or more calls to the kernel side to run tests there: + */ + +HTEST(selftest, msg) +{ + KTF_USERDATA(self, hybrid_self_params, data); + + strcpy(data->text_val, HYBRID_MSG); + data->val = HYBRID_MSG_VAL; + + /* assertions can be specified here: */ + EXPECT_TRUE(true); + + ktf::run(self); + + /* and here.. */ + EXPECT_TRUE(true); +} diff --git a/tools/testing/selftests/ktf/user/ktfcov.cc b/tools/testing/selftests/ktf/user/ktfcov.cc new file mode 100644 index 0000000..d5a9ef4 --- /dev/null +++ b/tools/testing/selftests/ktf/user/ktfcov.cc @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. + * Author: Alan Maguire <alan.maguire@xxxxxxxxxx> + * + * SPDX-License-Identifier: GPL-2.0 + * + * ktfcov.cpp: + * User level application to enable/disable coverage of kernel modules. + */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include "ktf.h" +#include "../kernel/ktf_unlproto.h" + +using namespace std; + +void +usage(char *progname) +{ + cerr << "Usage: " << progname << " [-e module[-m]] [-d module]\n"; +} + +int main (int argc, char** argv) +{ + int opt, nopts = 0; + unsigned int cov_opts = 0; + std::string modname = std::string(); + bool enable = false; + + ktf::setup(); + testing::InitGoogleTest(&argc,argv); + + if (argc < 3) { + usage(argv[0]); + return -1; + } + + while ((opt = getopt(argc, argv, "e:d:m")) != -1) { + switch (opt) { + case 'e': + nopts++; + enable = true; + modname = optarg; + break; + case 'd': + nopts++; + enable = false; + modname = optarg; + break; + case 'm': + cov_opts |= KTF_COV_OPT_MEM; + break; + default: + cerr << "Unknown option '" << char(optopt) << "'"; + return -1; + } + } + /* Either enable or disable must be specified, and -m is only valid + * for enable. + */ + if (modname.size() == 0 || nopts != 1 || (cov_opts && !enable)) { + usage(argv[0]); + return -1; + } + return ktf::set_coverage(modname, cov_opts, enable); +} diff --git a/tools/testing/selftests/ktf/user/ktfrun.cc b/tools/testing/selftests/ktf/user/ktfrun.cc new file mode 100644 index 0000000..9229b21 --- /dev/null +++ b/tools/testing/selftests/ktf/user/ktfrun.cc @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. + * Author: Knut Omang <knut.omang@xxxxxxxxxx> + * + * SPDX-License-Identifier: GPL-2.0 + * + * ktfrun.cpp: Generic user level application to run kernel tests + * provided by modules subscribing to ktf services. + */ +#include <stdio.h> +#include <stdlib.h> +#include <ktf.h> + +int main (int argc, char** argv) +{ + ktf::setup(); + testing::InitGoogleTest(&argc,argv); + + return RUN_ALL_TESTS(); +} diff --git a/tools/testing/selftests/ktf/user/ktftest.cc b/tools/testing/selftests/ktf/user/ktftest.cc new file mode 100644 index 0000000..fda625d --- /dev/null +++ b/tools/testing/selftests/ktf/user/ktftest.cc @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. + * Author: Knut Omang <knut.omang@xxxxxxxxxx> + * + * SPDX-License-Identifier: GPL-2.0 + * + * ktfrun.cpp: Generic user level application to run kernel tests + * provided by modules subscribing to ktf services. + */ +#include <stdio.h> +#include <stdlib.h> +#include <ktf.h> + +extern "C" { +#include "../selftest/context_self.h" +} + +void selftest_configure() +{ + struct test_parameter_block p; + memset(&p, 0, sizeof(p)); + strcpy(p.s, CONTEXT_MSG); + + /* First configure two contexts provided by the kernel part: */ + p.magic = CONTEXT_MAGIC1; + KTF_CONTEXT_CFG("context1", "context_type_1", test_parameter_block, &p); + p.magic = CONTEXT_MAGIC2; + KTF_CONTEXT_CFG("context2", "context_type_2", test_parameter_block, &p); + + /* Configure a 3rd, dynamically created context, using CONTEXT3_TYPE_ID + * which the kernel part has enabled for dynamic creation of contexts + * from user space (see kernel/context.c: add_context_tests() + * for details of setup) + */ + p.magic = CONTEXT_MAGIC3; + KTF_CONTEXT_CFG("context3", "context_type_3", test_parameter_block, &p); +} + + +int main (int argc, char** argv) +{ + ktf::setup(selftest_configure); + testing::InitGoogleTest(&argc,argv); + + return RUN_ALL_TESTS(); +} -- git-series 0.9.1