Shell test library v3
cover Shell test library v3
Changes againts RFC:
- The metadata in tests are encoded in JSON now, there is a proper parser used to decode them and construct the tst_test accordingly. Most of the C library features are now available in shell tests as well.
- The shell tests use a script to bootstrap themselves so they can be just executed normally see tst_loader.sh
- Many small fixes that were pointed out for the RFC
Cyril Hrubis (3):
Add support for mixing C and shell code
libs: Vendor ujson library
testcaes/lib: Add shell loader
include/tst_test.h | 40 +- include/ujson.h | 13 + include/ujson_common.h | 69 ++ include/ujson_reader.h | 539 ++++++++ include/ujson_utf.h | 168 +++ include/ujson_writer.h | 224 ++++ lib/tst_test.c | 51 + libs/ujson/Makefile | 12 + libs/ujson/ujson_common.c | 38 + libs/ujson/ujson_reader.c | 1081 +++++++++++++++++ libs/ujson/ujson_utf.c | 105 ++ libs/ujson/ujson_writer.c | 491 ++++++++ testcases/lib/.gitignore | 2 + testcases/lib/Makefile | 8 +- testcases/lib/run_tests.sh | 31 + testcases/lib/tests/.gitignore | 6 + testcases/lib/tests/Makefile | 11 + testcases/lib/tests/shell_loader.sh | 15 + .../lib/tests/shell_loader_all_filesystems.sh | 24 + .../lib/tests/shell_loader_filesystems.sh | 30 + .../tests/shell_loader_invalid_metadata.sh | 12 + testcases/lib/tests/shell_loader_kconfigs.sh | 9 + .../lib/tests/shell_loader_no_metadata.sh | 8 + .../lib/tests/shell_loader_supported_archs.sh | 9 + testcases/lib/tests/shell_loader_tags.sh | 12 + testcases/lib/tests/shell_loader_tcnt.sh | 12 + .../lib/tests/shell_loader_wrong_metadata.sh | 12 + testcases/lib/tests/shell_test01.c | 17 + testcases/lib/tests/shell_test02.c | 18 + testcases/lib/tests/shell_test03.c | 25 + testcases/lib/tests/shell_test04.c | 18 + testcases/lib/tests/shell_test05.c | 27 + testcases/lib/tests/shell_test06.c | 16 + testcases/lib/tests/shell_test_brk.sh | 6 + testcases/lib/tests/shell_test_check_argv.sh | 23 + testcases/lib/tests/shell_test_checkpoint.sh | 7 + testcases/lib/tests/shell_test_pass.sh | 6 + testcases/lib/tst_env.sh | 25 + testcases/lib/tst_loader.sh | 11 + testcases/lib/tst_res_.c | 58 + testcases/lib/tst_run_shell.c | 474 ++++++++ 41 files changed, 3760 insertions(+), 3 deletions(-) create mode 100644 include/ujson.h create mode 100644 include/ujson_common.h create mode 100644 include/ujson_reader.h create mode 100644 include/ujson_utf.h create mode 100644 include/ujson_writer.h create mode 100644 libs/ujson/Makefile create mode 100644 libs/ujson/ujson_common.c create mode 100644 libs/ujson/ujson_reader.c create mode 100644 libs/ujson/ujson_utf.c create mode 100644 libs/ujson/ujson_writer.c create mode 100755 testcases/lib/run_tests.sh create mode 100644 testcases/lib/tests/.gitignore create mode 100644 testcases/lib/tests/Makefile create mode 100755 testcases/lib/tests/shell_loader.sh create mode 100755 testcases/lib/tests/shell_loader_all_filesystems.sh create mode 100755 testcases/lib/tests/shell_loader_filesystems.sh create mode 100755 testcases/lib/tests/shell_loader_invalid_metadata.sh create mode 100755 testcases/lib/tests/shell_loader_kconfigs.sh create mode 100755 testcases/lib/tests/shell_loader_no_metadata.sh create mode 100755 testcases/lib/tests/shell_loader_supported_archs.sh create mode 100755 testcases/lib/tests/shell_loader_tags.sh create mode 100755 testcases/lib/tests/shell_loader_tcnt.sh create mode 100755 testcases/lib/tests/shell_loader_wrong_metadata.sh create mode 100644 testcases/lib/tests/shell_test01.c create mode 100644 testcases/lib/tests/shell_test02.c create mode 100644 testcases/lib/tests/shell_test03.c create mode 100644 testcases/lib/tests/shell_test04.c create mode 100644 testcases/lib/tests/shell_test05.c create mode 100644 testcases/lib/tests/shell_test06.c create mode 100755 testcases/lib/tests/shell_test_brk.sh create mode 100755 testcases/lib/tests/shell_test_check_argv.sh create mode 100755 testcases/lib/tests/shell_test_checkpoint.sh create mode 100755 testcases/lib/tests/shell_test_pass.sh create mode 100644 testcases/lib/tst_env.sh create mode 100644 testcases/lib/tst_loader.sh create mode 100644 testcases/lib/tst_res_.c create mode 100644 testcases/lib/tst_run_shell.c
Signature · 5 lines
2.44.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/3 Add support for mixing C and shell code
This is a proof of a concept of a seamless C and shell integration. The idea is that with this you can mix shell and C code as much as as you wish to get the best of the two worlds.
--- include/tst_test.h | 38 +++++++++++++ lib/tst_test.c | 51 +++++++++++++++++ testcases/lib/.gitignore | 1 + testcases/lib/Makefile | 4 +- testcases/lib/run_tests.sh | 11 ++++ testcases/lib/tests/.gitignore | 6 ++ testcases/lib/tests/Makefile | 11 ++++ testcases/lib/tests/shell_test01.c | 17 ++++++ testcases/lib/tests/shell_test02.c | 18 ++++++ testcases/lib/tests/shell_test03.c | 25 +++++++++ testcases/lib/tests/shell_test04.c | 18 ++++++ testcases/lib/tests/shell_test05.c | 27 +++++++++ testcases/lib/tests/shell_test06.c | 16 ++++++ testcases/lib/tests/shell_test_brk.sh | 6 ++ testcases/lib/tests/shell_test_check_argv.sh | 23 ++++++++ testcases/lib/tests/shell_test_checkpoint.sh | 7 +++ testcases/lib/tests/shell_test_pass.sh | 6 ++ testcases/lib/tst_env.sh | 21 +++++++ testcases/lib/tst_res_.c | 58 ++++++++++++++++++++ 19 files changed, 362 insertions(+), 2 deletions(-) create mode 100755 testcases/lib/run_tests.sh create mode 100644 testcases/lib/tests/.gitignore create mode 100644 testcases/lib/tests/Makefile create mode 100644 testcases/lib/tests/shell_test01.c create mode 100644 testcases/lib/tests/shell_test02.c create mode 100644 testcases/lib/tests/shell_test03.c create mode 100644 testcases/lib/tests/shell_test04.c create mode 100644 testcases/lib/tests/shell_test05.c create mode 100644 testcases/lib/tests/shell_test06.c create mode 100755 testcases/lib/tests/shell_test_brk.sh create mode 100755 testcases/lib/tests/shell_test_check_argv.sh create mode 100755 testcases/lib/tests/shell_test_checkpoint.sh create mode 100755 testcases/lib/tests/shell_test_pass.sh create mode 100644 testcases/lib/tst_env.sh create mode 100644 testcases/lib/tst_res_.c
include/tst_test.h +38 -0
@@ -331,6 +331,8 @@ struct tst_fs {* @child_needs_reinit: Has to be set if the test needs to call tst_reinit() * from a process started by exec(). * +* @runs_script: Implies child_needs_reinit and forks_child at the moment. +* * @needs_devfs: If set the devfs is mounted at tst_test.mntpoint. This is * needed for tests that need to create device files since tmpfs * at /tmp is usually mounted with 'nodev' option.
@@ -518,6 +520,7 @@ struct tst_fs { unsigned int mount_device:1; unsigned int needs_rofs:1; unsigned int child_needs_reinit:1; + unsigned int runs_script:1; unsigned int needs_devfs:1; unsigned int restore_wallclock:1;
@@ -526,6 +529,8 @@ struct tst_fs { unsigned int skip_in_lockdown:1; unsigned int skip_in_secureboot:1; unsigned int skip_in_compat:1; + +int needs_abi_bits; unsigned int needs_hugetlbfs:1;
@@ -611,6 +616,39 @@ void tst_run_tcases(int argc, char *argv[], struct tst_test *self)*/ void tst_reinit (void ); +/** +* tst_run_shell() - Prepare the environment and execute a shell script. +* +* @script_name: A filename of the script. +* @params: A NULL terminated array of shell script parameters, pass NULL if +* none are needed. This what is passed starting from argv[1]. +* +* The shell script is executed with LTP_IPC_PATH in environment so that the +* binary helpers such as tst_res_ or tst_checkpoint work properly when executed +* from the script. This also means that the tst_test.runs_script flag needs to +* be set. +* +* The shell script itself has to source the tst_env.sh shell script at the +* start and after that it's free to use tst_res in the same way C code would +* use. +* +* Example shell script that reports success:: +* +* #!/bin/sh +* . tst_env.sh +* +* tst_res TPASS "Example test works" +* +* The call returns a pid in a case that you want to examine the return value +* of the script yourself. If you do not need to check the return value +* yourself you can use tst_reap_children() to wait for the completion. Or let +* the test library collect the child automatically, just be wary that the +* script and the test both runs concurently at the same time in this case. +* +* Return: A pid of the shell process. +*/ +int tst_run_shell (char *script_name,char *const params[]); +unsigned int tst_multiply_timeout (unsigned int timeout);/*
lib/tst_test.c +51 -0
69 lines not on this page · raw message
testcases/lib/.gitignore +1 -0
@@ -23,3 +23,4 @@ /tst_sleep /tst_supported_fs /tst_timeout_kill +/tst_res_
testcases/lib/Makefile +2 -2
@@ -13,6 +13,6 @@ MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ tst_getconf tst_supported_fs tst_check_drivers tst_get_unused_port\ tst_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ tst_check_kconfigs tst_cgctl tst_fsfreeze tst_ns_create tst_ns_exec\ - tst_ns_ifmove tst_lockdown_enabled tst_secureboot_enabled + tst_ns_ifmove tst_lockdown_enabled tst_secureboot_enabled tst_res_ -include $(top_srcdir)/include/mk/generic_leaf_target.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/lib/run_tests.sh new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh + +testdir=$(realpath $(dirname $0)) +export PATH=$PATH:$testdir:$testdir/tests/ + +for i in `seq -w 01 06`; do + echo + echo "*** Running shell_test$i ***" + echo + ./tests/shell_test$i +done
testcases/lib/tests/.gitignore new file +6 -0
@@ -0,0 +1,6 @@ +shell_test01 +shell_test02 +shell_test03 +shell_test04 +shell_test05 +shell_test06
testcases/lib/tests/Makefile new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2009, Cisco Systems Inc. +# Ngie Cooper, August 2009 + +top_srcdir ?= ../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +INSTALL_TARGETS= + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/lib/tests/shell_test01.c new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Shell test example. +*/ + +#include "tst_test.h" + +static void run_test (void ) +{ +tst_run_shell ("shell_test_pass.sh" ,NULL ); +tst_res (TINFO ,"C test exits now" ); +} + +static struct tst_test test = { + .runs_script =1 , + .test_all = run_test, +};
testcases/lib/tests/shell_test02.c new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Shell test example. +*/ + +#include "tst_test.h" + +static void run_test (void ) +{ +tst_run_shell ("shell_test_pass.sh" ,NULL ); +tst_reap_children (); +tst_res (TINFO ,"Shell test has finished at this point!" ); +} + +static struct tst_test test = { + .runs_script =1 , + .test_all = run_test, +};
testcases/lib/tests/shell_test03.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Shell test example. +*/ + +#include <sys/wait.h> +#include "tst_test.h" + +static void run_test (void ) +{ +int pid, status; + + pid =tst_run_shell ("shell_test_pass.sh" ,NULL ); + +tst_res (TINFO ,"Waiting for the pid %i" , pid); + +waitpid (pid, &status,0 ); + +tst_res (TINFO ,"Shell test has %s" ,tst_strstatus (status)); +} + +static struct tst_test test = { + .runs_script =1 , + .test_all = run_test, +};
testcases/lib/tests/shell_test04.c new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Shell test example. +*/ + +#include "tst_test.h" + +static void run_test (void ) +{ +char *const params[] = {"param1" ,"param2" ,NULL }; + +tst_run_shell ("shell_test_check_argv.sh" , params); +} + +static struct tst_test test = { + .runs_script =1 , + .test_all = run_test, +};
testcases/lib/tests/shell_test05.c new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Shell test example. +*/ + +#include "tst_test.h" + +static void run_test (void ) +{ +int pid; + + pid =tst_run_shell ("shell_test_checkpoint.sh" ,NULL ); + +tst_res (TINFO ,"Waiting for shell to sleep on checkpoint!" ); + +TST_PROCESS_STATE_WAIT (pid,'S' ,10000 ); + +tst_res (TINFO ,"Waking shell child!" ); + +TST_CHECKPOINT_WAKE (0 ); +} + +static struct tst_test test = { + .runs_script =1 , + .needs_checkpoints =1 , + .test_all = run_test, +};
testcases/lib/tests/shell_test06.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Shell test example. +*/ + +#include "tst_test.h" + +static void run_test (void ) +{ +tst_run_shell ("shell_test_brk.sh" ,NULL ); +} + +static struct tst_test test = { + .runs_script =1 , + .test_all = run_test, +};
testcases/lib/tests/shell_test_brk.sh new file +6 -0
@@ -0,0 +1,6 @@ +#!/bin/sh + +. tst_env.sh + +tst_brk TCONF "This exits test and the next message should not be reached" +tst_res TFAIL "If you see this the test failed"
testcases/lib/tests/shell_test_check_argv.sh new file +23 -0
@@ -0,0 +1,23 @@ +#!/bin/sh + +. tst_env.sh + +tst_res TINFO "argv = $@" + +if [ $# -ne 2 ]; then + tst_res TFAIL "Wrong number of parameters got $# expected 2" +else + tst_res TPASS "Got 2 parameters" +fi + +if [ "$1" != "param1" ]; then + tst_res TFAIL "First parameter is $1 expected param1" +else + tst_res TPASS "First parameter is $1" +fi + +if [ "$2" != "param2" ]; then + tst_res TFAIL "Second parameter is $2 expected param2" +else + tst_res TPASS "Second parameter is $2" +fi
testcases/lib/tests/shell_test_checkpoint.sh new file +7 -0
@@ -0,0 +1,7 @@ +#!/bin/sh + +. tst_env.sh + +tst_res TINFO "Waiting for a checkpoint 0" +tst_checkpoint wait 10000 0 +tst_res TPASS "Continuing after checkpoint"
testcases/lib/tests/shell_test_pass.sh new file +6 -0
@@ -0,0 +1,6 @@ +#!/bin/sh + +. tst_env.sh + +tst_res TPASS "This is called from the shell script!" +tst_sleep 100ms
testcases/lib/tst_env.sh new file +21 -0
@@ -0,0 +1,21 @@ +#!/bin/sh + +tst_script_name=$(basename $0) + +if [ -z "$LTP_IPC_PATH" ]; then + echo "This script has to be executed from a LTP loader!" + exit 1 +fi + +tst_brk_() +{ + tst_res_ "$@" + + case "$3" in + "TBROK") exit 2;; + *) exit 0;; + esac +} + +alias tst_res="tst_res_ $tst_script_name \$LINENO" +alias tst_brk="tst_brk_ $tst_script_name \$LINENO"
testcases/lib/tst_res_.c new file +58 -0
58 lines not on this page · raw message
Signature · 5 lines
2.44.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 1/3] Add support for mixing C and shell code
Hi!
lib/tst_test.c line 8
Quoted 10 lines
lib/tst_test.c +2
-0@@ -4,6 +4,8 @@* Copyright (c) Linux Test Project, 2016-2024 */ +#define _GNU_SOURCE +
And this actualy causes obscure build failure on musl.
The problem is that on musl sched.h exposes clone() when _GNU_SOURCE is defined and at the same time sched.h does not get pulled before tst_clone.h gets included, which means that the macro from tst_clone.h that rewrites clone() functions actually rewrites the function declaration in the system header.
The solution is to include sched.h in the tst_clone.h which guarantees that headers are included in the right order, however after this the compilation fails in:
testcases/kernel/controllers/cpuset/cpuset_lib/
Because the library defines sched_setaffinity() prototype incompatible with the system headers and tst_sched.h gets pulled there from test.h. (That is something to be fixed, but that would be likely complete
rewrite of these testcases.)
However there is no need to include tst_clone.h in test.h since there is only single old library test that uses ltp_clone() API. So the whole fix should be:
include/old/test.h +0 -1
@@ -31,7 +31,6 @@#include "tst_pid.h" #include "tst_cmd.h" #include "tst_cpu.h" -#include "tst_clone.h" #include "old_device.h" #include "old_tmpdir.h" #include "tst_minmax.h"
include/tst_clone.h +2 -0
@@ -5,6 +5,8 @@#ifndef TST_CLONE_H__ #define TST_CLONE_H__ +#include <sched.h> +#ifdef TST_TEST_H__ /* The parts of clone3's clone_args we support */
testcases/kernel/syscalls/clone/clone02.c +1 -0
@@ -59,6 +59,7 @@#include <sched.h> #include "test.h" #include "safe_macros.h" +#include "tst_clone.h" #define FLAG_ALL (CLONE_VM|CLONE_FS|CLONE_FILES|CLONE_SIGHAND|SIGCHLD)#define FLAG_NONE SIGCHLD
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/3 libs: Vendor ujson library
In reply to Cyril HrubisSee: https://github.com/metan-ucw/ujson
--- include/ujson.h | 13 + include/ujson_common.h | 69 +++ include/ujson_reader.h | 539 ++++++++++++++++++ include/ujson_utf.h | 168 ++++++ include/ujson_writer.h | 224 ++++++++ libs/ujson/Makefile | 12 + libs/ujson/ujson_common.c | 38 ++ libs/ujson/ujson_reader.c | 1081 +++++++++++++++++++++++++++++++++++++ libs/ujson/ujson_utf.c | 105 ++++ libs/ujson/ujson_writer.c | 491 +++++++++++++++++ 10 files changed, 2740 insertions(+) create mode 100644 include/ujson.h create mode 100644 include/ujson_common.h create mode 100644 include/ujson_reader.h create mode 100644 include/ujson_utf.h create mode 100644 include/ujson_writer.h create mode 100644 libs/ujson/Makefile create mode 100644 libs/ujson/ujson_common.c create mode 100644 libs/ujson/ujson_reader.c create mode 100644 libs/ujson/ujson_utf.c create mode 100644 libs/ujson/ujson_writer.c
include/ujson.h new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* +* Copyright (C) 2021-2024 Cyril Hrubis <[email protected]> +*/ + +#ifndef UJSON_H +#define UJSON_H + +#include <ujson_common.h> +#include <ujson_reader.h> +#include <ujson_writer.h> + +#endif /* UJSON_H */
include/ujson_common.h new file +69 -0
69 lines not on this page · raw message
include/ujson_reader.h new file +539 -0
539 lines not on this page · raw message
include/ujson_utf.h new file +168 -0
168 lines not on this page · raw message
include/ujson_writer.h new file +224 -0
224 lines not on this page · raw message
libs/ujson/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (C) Cyril Hrubis <[email protected]> + +top_srcdir ?= ../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INTERNAL_LIB := libujson.a + +include $(top_srcdir)/include/mk/lib.mk +include $(top_srcdir)/include/mk/generic_leaf_target.mk
libs/ujson/ujson_common.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* +* Copyright (C) 2021-2024 Cyril Hrubis <[email protected]> +*/ + +#include <stdio.h> +#include "ujson_common.h" + +void ujson_err_handler (void *err_print_priv,const char *line) +{ +fputs (line, err_print_priv); +putc ('\n' , err_print_priv); +} + +const char *ujson_type_name (enum ujson_type type) +{ +switch (type) { +case UJSON_VOID : +return "void" ; +case UJSON_INT : +return "integer" ; +case UJSON_FLOAT : +return "float" ; +case UJSON_BOOL : +return "boolean" ; +case UJSON_NULL : +return "null" ; +case UJSON_STR : +return "string" ; +case UJSON_OBJ : +return "object" ; +case UJSON_ARR : +return "array" ; +default : +return "invalid" ; + } +} +
libs/ujson/ujson_reader.c new file +1081 -0
1,081 lines not on this page · raw message
libs/ujson/ujson_utf.c new file +105 -0
105 lines not on this page · raw message
libs/ujson/ujson_writer.c new file +491 -0
491 lines not on this page · raw message
Signature · 5 lines
2.44.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 3/3 testcaes/lib: Add shell loader
In reply to Cyril HrubisThis commit implements a shell loader so that we don't have to write a C loader for each LTP shell test. The idea is simple, the loader parses the shell test and prepares the tst_test structure accordingly, then runs the actual shell test.
The format for the metadata in the shell test was choosen to be JSON because:
- I didn't want to invent an adhoc format and JSON is perfect for serializing data structures
- The metadata parser for shell test will be trivial, it will just pick the JSON from the comment, no parsing will be required
--- include/tst_test.h | 2 +- testcases/lib/.gitignore | 1 + testcases/lib/Makefile | 6 +- testcases/lib/run_tests.sh | 20 + testcases/lib/tests/shell_loader.sh | 15 + .../lib/tests/shell_loader_all_filesystems.sh | 24 + .../lib/tests/shell_loader_filesystems.sh | 30 ++ .../tests/shell_loader_invalid_metadata.sh | 12 + testcases/lib/tests/shell_loader_kconfigs.sh | 9 + .../lib/tests/shell_loader_no_metadata.sh | 8 + .../lib/tests/shell_loader_supported_archs.sh | 9 + testcases/lib/tests/shell_loader_tags.sh | 12 + testcases/lib/tests/shell_loader_tcnt.sh | 12 + .../lib/tests/shell_loader_wrong_metadata.sh | 12 + testcases/lib/tst_env.sh | 4 + testcases/lib/tst_loader.sh | 11 + testcases/lib/tst_run_shell.c | 474 ++++++++++++++++++ 17 files changed, 659 insertions(+), 2 deletions(-) create mode 100755 testcases/lib/tests/shell_loader.sh create mode 100755 testcases/lib/tests/shell_loader_all_filesystems.sh create mode 100755 testcases/lib/tests/shell_loader_filesystems.sh create mode 100755 testcases/lib/tests/shell_loader_invalid_metadata.sh create mode 100755 testcases/lib/tests/shell_loader_kconfigs.sh create mode 100755 testcases/lib/tests/shell_loader_no_metadata.sh create mode 100755 testcases/lib/tests/shell_loader_supported_archs.sh create mode 100755 testcases/lib/tests/shell_loader_tags.sh create mode 100755 testcases/lib/tests/shell_loader_tcnt.sh create mode 100755 testcases/lib/tests/shell_loader_wrong_metadata.sh create mode 100644 testcases/lib/tst_loader.sh create mode 100644 testcases/lib/tst_run_shell.c
include/tst_test.h +1 -1
@@ -274,7 +274,7 @@ struct tst_fs {const char *const *mkfs_opts;const char *mkfs_size_opt; -const unsigned int mnt_flags; +unsigned int mnt_flags;const void *mnt_data; };
testcases/lib/.gitignore +1 -0
@@ -24,3 +24,4 @@ /tst_supported_fs /tst_timeout_kill /tst_res_ +/tst_run_shell
testcases/lib/Makefile +5 -1
@@ -4,6 +4,9 @@ top_srcdir ?= ../.. +LTPLIBS = ujson +tst_run_shell: LTPLDLIBS = -lujson + include $(top_srcdir)/include/mk/testcases.mk INSTALL_TARGETS := *.sh
@@ -13,6 +16,7 @@ MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ tst_getconf tst_supported_fs tst_check_drivers tst_get_unused_port\ tst_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ tst_check_kconfigs tst_cgctl tst_fsfreeze tst_ns_create tst_ns_exec\ - tst_ns_ifmove tst_lockdown_enabled tst_secureboot_enabled tst_res_ + tst_ns_ifmove tst_lockdown_enabled tst_secureboot_enabled tst_res_\ + tst_run_shell include $(top_srcdir)/include/mk/generic_trunk_target.mk
testcases/lib/run_tests.sh +20 -0
@@ -9,3 +9,23 @@ for i in `seq -w 01 06`; do echo ./tests/shell_test$i done + +for i in shell_loader.sh shell_loader_all_filesystems.sh shell_loader_no_metadata.sh \ + shell_loader_wrong_metadata.sh shell_loader_invalid_metadata.sh\ + shell_loader_supported_archs.sh shell_loader_filesystems.sh\ + shell_loader_tcnt.sh shell_loader_kconfigs.sh shell_loader_tags.sh; do + echo + echo "*** Running $i ***" + echo + $i +done + +echo +echo "*** Testing LTP test -h option ***" +echo +shell_loader.sh -h + +echo +echo "*** Testing LTP test -i option ***" +echo +shell_loader.sh -i 2
testcases/lib/tests/shell_loader.sh new file +15 -0
@@ -0,0 +1,15 @@ +#!/bin/sh +# +# TEST = { +# "needs_tmpdir": true +# } + +. tst_loader.sh + +tst_res TPASS "Shell loader works fine!" +case "$PWD" in + /tmp/*) + tst_res TPASS "We are running in temp directory in $PWD";; + *) + tst_res TFAIL "We are not running in temp directory but $PWD";; +esac
testcases/lib/tests/shell_loader_all_filesystems.sh new file +24 -0
@@ -0,0 +1,24 @@ +#!/bin/sh +# +# TEST = { +# "needs_root": true, +# "mount_device": true, +# "all_filesystems": true, +# "mntpoint": "ltp_mntpoint" +# } + +. tst_loader.sh + +tst_res TINFO "In shell" + +mntpath=$(realpath ltp_mntpoint) +mounted=$(grep $mntpath /proc/mounts) + +if [ -n "$mounted" ]; then + device=$(echo $mounted |cut -d' ' -f 1) + path=$(echo $mounted |cut -d' ' -f 2) + + tst_res TPASS "$device mounted at $path" +else + tst_res TFAIL "Device not mounted!" +fi
testcases/lib/tests/shell_loader_filesystems.sh new file +30 -0
@@ -0,0 +1,30 @@ +#!/bin/sh +# +# TEST = { +# "mount_device": true, +# "mntpoint": "ltp_mntpoint", +# "filesystems": [ +# { +# "type": "btrfs" +# }, +# { +# "type": "xfs", +# "mkfs_opts": ["-m", "reflink=1"] +# } +# ] +# } + +. tst_loader.sh + +tst_res TINFO "In shell" + +mntpoint=$(realpath ltp_mntpoint) +mounted=$(grep $mntpoint /proc/mounts) + +if [ -n "$mounted" ]; then + fs=$(echo $mounted |cut -d' ' -f 3) + + tst_res TPASS "Mounted device formatted with $fs" +else + tst_res TFAIL "Device not mounted!" +fi
testcases/lib/tests/shell_loader_invalid_metadata.sh new file +12 -0
@@ -0,0 +1,12 @@ +#!/bin/sh +# +# This test has wrong metadata and should not be run +# +# TEST = { +# {"needs_tmpdir": 42, +# } +# + +. tst_loader.sh + +tst_res TFAIL "Shell loader should TBROK the test"
testcases/lib/tests/shell_loader_kconfigs.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/sh +# +# TEST = { +# "needs_kconfigs": ["CONFIG_NUMA=y"] +# } + +. tst_loader.sh + +tst_res TPASS "Shell loader works fine!"
testcases/lib/tests/shell_loader_no_metadata.sh new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/sh +# +# This test has no metadata and should not be executed +# + +. tst_loader.sh + +tst_res TFAIL "Shell loader should TBROK the test"
testcases/lib/tests/shell_loader_supported_archs.sh new file +9 -0
@@ -0,0 +1,9 @@ +#!/bin/sh +# +# TEST = { +# "supported_archs": ["x86", "ppc64", "x86_64"] +# } + +. tst_loader.sh + +tst_res TPASS "We are running on supported architecture"
testcases/lib/tests/shell_loader_tags.sh new file +12 -0
@@ -0,0 +1,12 @@ +#!/bin/sh +# +# TEST = { +# "tags": [ +# ["linux-git", "832478cd342ab"], +# ["CVE", "2099-999"] +# ] +# } + +. tst_loader.sh + +tst_res TFAIL "Fails the test so that tags are shown."
testcases/lib/tests/shell_loader_tcnt.sh new file +12 -0
@@ -0,0 +1,12 @@ +#!/bin/sh +# +# The script should be executed tcnt times and the iteration number should be in $1 +# +# TEST = { +# "tcnt": 2 +# } +# + +. tst_loader.sh + +tst_res TPASS "Iteration $1"
testcases/lib/tests/shell_loader_wrong_metadata.sh new file +12 -0
@@ -0,0 +1,12 @@ +#!/bin/sh +# +# This test has wrong metadata and should not be run +# +# TEST = { +# "needs_tmpdir": 42, +# } +# + +. tst_loader.sh + +tst_res TFAIL "Shell loader should TBROK the test"
testcases/lib/tst_env.sh +4 -0
@@ -1,4 +1,8 @@ #!/bin/sh +# +# This is a minimal test environment for a shell scripts executed from C by +# tst_run_shell() function. Shell tests must use the tst_loader.sh instead! +# tst_script_name=$(basename $0)
testcases/lib/tst_loader.sh new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh +# +# This is a loader for shell tests that use the C test library. +# + +if [ -z "$LTP_IPC_PATH" ]; then + tst_run_shell $(basename "$0") "$@" + exit $? +else + . tst_env.sh +fi
testcases/lib/tst_run_shell.c new file +474 -0
474 lines not on this page · raw message
Signature · 5 lines
2.44.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp