| Message ID | 1641779349-8424-3-git-send-email-xuyang2018.jy@fujitsu.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3,1/4] lib/tst_kconfig: Modify the return type of tst_kconfig_check function | expand |
On Mon, Jan 10, 2022 at 2:26 PM Yang Xu <xuyang2018.jy@fujitsu.com> wrote: > +1.7 Parsing kernel .config > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > +The shell library provides an implementation of the kconfig parsing interface > +compatible with the C version. ^ consistent with the C version. > +++ b/testcases/lib/tst_check_kconfigs.c > @@ -0,0 +1,54 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.*/ > + > +#include <stdio.h> > +#include <string.h> > +#include <limits.h> > +#include <stdlib.h> > +#include "tst_kconfig.h" > + > +int main(int argc, const char *argv[]) > +{ > + char delim[2]; > + char str[PATH_MAX]; > + char *result = NULL; > + char *next = NULL; > + int i = 0, j = 0, ret = 0; > + > + if (argc < 3) { > + fprintf(stderr, "Please provide kernel kconfig list and delims\n"); > + return 1; > + } > + > + if (strlen(argv[2]) != 1) { > + fprintf(stderr, "The delim must be a single character\n"); > + return 1; > + } > + > + strcpy(str, argv[1]); > + strcpy(delim, argv[2]); > + > + result = strtok_r(str, delim, &next); > + for (i = 0; result != NULL; i++) > + result = strtok_r(NULL, delim, &next); > + > + strcpy(str, argv[1]); > + char **kconfigs = (char **)malloc(++i * sizeof(char *)); > + > + result = strtok_r(str, delim, &next); > + for (i = 0; result != NULL; i++) { > + kconfigs[i] = (char *)malloc(sizeof(char) * strlen(result)); > + strcpy(kconfigs[i], result); I guess there is no need to allocate additional memory to do strcpy. As the kconfigs[i] is just a pointer, we can assign the 'result' to it directly. i.e. for (i = 0; result != NULL; i++) { kconfigs[i] = result; result = strtok_r(NULL, delim, &next); } Otherwise looks good. Reviewed-by: Li Wang <liwang@redhat.com> -- Regards, Li Wang
Hi Li > On Mon, Jan 10, 2022 at 2:26 PM Yang Xu<xuyang2018.jy@fujitsu.com> wrote: > >> +1.7 Parsing kernel .config >> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> +The shell library provides an implementation of the kconfig parsing interface >> +compatible with the C version. > > ^ consistent with the C version. Yes. > >> +++ b/testcases/lib/tst_check_kconfigs.c >> @@ -0,0 +1,54 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +/* Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.*/ >> + >> +#include<stdio.h> >> +#include<string.h> >> +#include<limits.h> >> +#include<stdlib.h> >> +#include "tst_kconfig.h" >> + >> +int main(int argc, const char *argv[]) >> +{ >> + char delim[2]; >> + char str[PATH_MAX]; >> + char *result = NULL; >> + char *next = NULL; >> + int i = 0, j = 0, ret = 0; >> + >> + if (argc< 3) { >> + fprintf(stderr, "Please provide kernel kconfig list and delims\n"); >> + return 1; >> + } >> + >> + if (strlen(argv[2]) != 1) { >> + fprintf(stderr, "The delim must be a single character\n"); >> + return 1; >> + } >> + >> + strcpy(str, argv[1]); >> + strcpy(delim, argv[2]); >> + >> + result = strtok_r(str, delim,&next); >> + for (i = 0; result != NULL; i++) >> + result = strtok_r(NULL, delim,&next); >> + >> + strcpy(str, argv[1]); >> + char **kconfigs = (char **)malloc(++i * sizeof(char *)); >> + >> + result = strtok_r(str, delim,&next); >> + for (i = 0; result != NULL; i++) { >> + kconfigs[i] = (char *)malloc(sizeof(char) * strlen(result)); >> + strcpy(kconfigs[i], result); > > I guess there is no need to allocate additional memory to do strcpy. > As the kconfigs[i] is just a pointer, we can assign the 'result' to it directly. > > i.e. > > for (i = 0; result != NULL; i++) { > kconfigs[i] = result; > result = strtok_r(NULL, delim,&next); > } > Yes, thanks for your review. We can modify those when maintainer merges it. Best Regard Yang Xu > Otherwise looks good. > Reviewed-by: Li Wang<liwang@redhat.com> > > -- > Regards, > Li Wang >
On Mon, Jan 10, 2022 at 4:48 PM xuyang2018.jy@fujitsu.com <xuyang2018.jy@fujitsu.com> wrote: > > Hi Li > > On Mon, Jan 10, 2022 at 2:26 PM Yang Xu<xuyang2018.jy@fujitsu.com> wrote: > > > >> +1.7 Parsing kernel .config > >> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > >> +The shell library provides an implementation of the kconfig parsing interface > >> +compatible with the C version. > > > > ^ consistent with the C version. > Yes. > > > >> +++ b/testcases/lib/tst_check_kconfigs.c > >> @@ -0,0 +1,54 @@ > >> +// SPDX-License-Identifier: GPL-2.0-or-later > >> +/* Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.*/ > >> + > >> +#include<stdio.h> > >> +#include<string.h> > >> +#include<limits.h> > >> +#include<stdlib.h> > >> +#include "tst_kconfig.h" > >> + > >> +int main(int argc, const char *argv[]) > >> +{ > >> + char delim[2]; > >> + char str[PATH_MAX]; > >> + char *result = NULL; > >> + char *next = NULL; > >> + int i = 0, j = 0, ret = 0; > >> + > >> + if (argc< 3) { > >> + fprintf(stderr, "Please provide kernel kconfig list and delims\n"); > >> + return 1; > >> + } > >> + > >> + if (strlen(argv[2]) != 1) { > >> + fprintf(stderr, "The delim must be a single character\n"); > >> + return 1; > >> + } > >> + > >> + strcpy(str, argv[1]); > >> + strcpy(delim, argv[2]); > >> + > >> + result = strtok_r(str, delim,&next); > >> + for (i = 0; result != NULL; i++) > >> + result = strtok_r(NULL, delim,&next); > >> + > >> + strcpy(str, argv[1]); > >> + char **kconfigs = (char **)malloc(++i * sizeof(char *)); And, I also think that if traverse the number of delim, then we will avoid doing strcpy twice here. But that's not important, I have no strong insist on this way. i.e. strcpy(str, argv[1]); strcpy(delim, argv[2]); for (next = str, i = 1; next[j] != '\0'; j++) if (next[j] == delim[0]) i++; char **kconfigs = (char **)malloc(++i * sizeof(char *)); > We can modify those when maintainer merges it. Sure.
Hi! > Use tst_check_kconfigs command to call tst_kconfig_check function in internal. > It introduces two variables in tst_test.sh > TST_NEEDS_KCONFIGS > TST_NEEDS_KCONFIGS_IFS (default value is comma) > > Also, we can use tst_check_kconfigs in your shell case if you want to skip subtest > case instead the whole test. > > Fixes:#891 > Suggested-by: Petr Vorel <pvorel@suse.cz> > Suggested-by: Cyril Hrubis <chrubis@suse.cz> > Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> > --- > doc/shell-test-api.txt | 51 ++++++++++++------ > lib/newlib_tests/runtest.sh | 3 +- > lib/newlib_tests/shell/tst_check_kconfig01.sh | 16 ++++++ > lib/newlib_tests/shell/tst_check_kconfig02.sh | 15 ++++++ > lib/newlib_tests/shell/tst_check_kconfig03.sh | 16 ++++++ > lib/newlib_tests/shell/tst_check_kconfig04.sh | 25 +++++++++ > testcases/lib/.gitignore | 1 + > testcases/lib/Makefile | 3 +- > testcases/lib/tst_check_kconfigs.c | 54 +++++++++++++++++++ > testcases/lib/tst_test.sh | 15 ++++++ > 10 files changed, 181 insertions(+), 18 deletions(-) > create mode 100755 lib/newlib_tests/shell/tst_check_kconfig01.sh > create mode 100755 lib/newlib_tests/shell/tst_check_kconfig02.sh > create mode 100755 lib/newlib_tests/shell/tst_check_kconfig03.sh > create mode 100644 lib/newlib_tests/shell/tst_check_kconfig04.sh > create mode 100644 testcases/lib/tst_check_kconfigs.c > > diff --git a/doc/shell-test-api.txt b/doc/shell-test-api.txt > index b993a9e1e..e082808f7 100644 > --- a/doc/shell-test-api.txt > +++ b/doc/shell-test-api.txt > @@ -193,22 +193,25 @@ simply by setting right '$TST_NEEDS_FOO'. > > [options="header"] > |============================================================================= > -| Variable name | Action done > -| 'TST_NEEDS_ROOT' | Exit the test with 'TCONF' unless executed under root. > -| | Alternatively the 'tst_require_root' command can be used. > -| 'TST_NEEDS_TMPDIR' | Create test temporary directory and cd into it. > -| 'TST_NEEDS_DEVICE' | Prepare test temporary device, the path to testing > - device is stored in '$TST_DEVICE' variable. > - The option implies 'TST_NEEDS_TMPDIR'. > -| 'TST_NEEDS_CMDS' | String with command names that has to be present for > - the test (see below). > -| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below). > -| 'TST_NEEDS_DRIVERS'| Checks kernel drivers support for the test. > -| 'TST_TIMEOUT' | Maximum timeout set for the test in sec. Must be int >= 1, > - or -1 (special value to disable timeout), default is 300. > - Variable is meant be set in tests, not by user. > - It's an equivalent of `tst_test.timeout` in C, can be set > - via 'tst_set_timeout(timeout)' after test has started. > +| Variable name | Action done > +| 'TST_NEEDS_ROOT' | Exit the test with 'TCONF' unless executed under root. > +| | Alternatively the 'tst_require_root' command can be used. > +| 'TST_NEEDS_TMPDIR' | Create test temporary directory and cd into it. > +| 'TST_NEEDS_DEVICE' | Prepare test temporary device, the path to testing > + device is stored in '$TST_DEVICE' variable. > + The option implies 'TST_NEEDS_TMPDIR'. > +| 'TST_NEEDS_CMDS' | String with command names that has to be present for > + the test (see below). > +| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below). > +| 'TST_NEEDS_DRIVERS' | Checks kernel drivers support for the test. > +| 'TST_NEEDS_KCONFIGS' | Checks kernel kconfigs support for the test (see below). > +| 'TST_NEEDS_KCONFIGS_IFS' | Used for splitting '$TST_NEEDS_KCONFIGS' variable, > + default value is comma, it only supports single character. > +| 'TST_TIMEOUT' | Maximum timeout set for the test in sec. Must be int >= 1, > + or -1 (special value to disable timeout), default is 300. > + Variable is meant be set in tests, not by user. > + It's an equivalent of `tst_test.timeout` in C, can be set > + via 'tst_set_timeout(timeout)' after test has started. > |============================================================================= > > [options="header"] > @@ -742,3 +745,19 @@ TST_NEEDS_CHECKPOINTS=1 > Since both the implementations are compatible, it's also possible to start > a child binary process from a shell test and synchronize with it. This process > must have checkpoints initialized by calling 'tst_reinit()'. > + > +1.7 Parsing kernel .config > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > +The shell library provides an implementation of the kconfig parsing interface > +compatible with the C version. > + > +It's possible to pass kernel kconfig list for tst_require_kconfigs API with > +'$TST_NEEDS_KCONFIGS'. > +Optional '$TST_NEEDS_KCONFIGS_IFS' is used for splitting, default value is comma. > + > +------------------------------------------------------------------------------- > +#!/bin/sh > +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS, CONFIG_QUOTACTL=y" > + > +. tst_test.sh > +------------------------------------------------------------------------------- > diff --git a/lib/newlib_tests/runtest.sh b/lib/newlib_tests/runtest.sh > index 8b2fe347a..b34a582b7 100755 > --- a/lib/newlib_tests/runtest.sh > +++ b/lib/newlib_tests/runtest.sh > @@ -6,7 +6,8 @@ tst_needs_cmds01 tst_needs_cmds02 tst_needs_cmds03 tst_needs_cmds06 > tst_needs_cmds07 tst_bool_expr test_exec test_timer tst_res_hexd tst_strstatus > tst_fuzzy_sync03 test_zero_hugepage.sh}" > > -LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh shell/net/*.sh}" > +LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh > +shell/tst_check_kconfig0[1-4].sh shell/net/*.sh}" It would be slightly safter to actually export the KCONFIG_PATH pointing to one of the config files created for the C tests (config02) if we are goind to run this in CI. It's very unlikely that anyone who runs these tests wouldn't have CONFIG_EXT4_FS in but it may actually happen. > cd $(dirname $0) > PATH="$PWD/../../testcases/lib/:$PATH" > diff --git a/lib/newlib_tests/shell/tst_check_kconfig01.sh b/lib/newlib_tests/shell/tst_check_kconfig01.sh > new file mode 100755 > index 000000000..065a20fd2 > --- /dev/null > +++ b/lib/newlib_tests/shell/tst_check_kconfig01.sh > @@ -0,0 +1,16 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0-or-later > +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. > + > +TST_TESTFUNC=do_test > +TST_NEEDS_CMDS="tst_check_kconfigs" I wouldn't bother with checking for this, it's part of the LTP it's not an external tool that could be missing. > +TST_NEEDS_KCONFIGS="CONFIG_EXT4" > + > +. tst_test.sh > + > +do_test() > +{ > + tst_res TFAIL "kernel .config doesn't have CONFIG_EXT4" > +} > + > +tst_run > diff --git a/lib/newlib_tests/shell/tst_check_kconfig02.sh b/lib/newlib_tests/shell/tst_check_kconfig02.sh > new file mode 100755 > index 000000000..3a0f05847 > --- /dev/null > +++ b/lib/newlib_tests/shell/tst_check_kconfig02.sh > @@ -0,0 +1,15 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0-or-later > +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. > + > +TST_TESTFUNC=do_test > +TST_NEEDS_CMDS="tst_check_kconfigs" > +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS : CONFIG_XFS_FS" > +. tst_test.sh > + > +do_test() > +{ > + tst_res TFAIL "invalid kconfig delimter" > +} > + > +tst_run > diff --git a/lib/newlib_tests/shell/tst_check_kconfig03.sh b/lib/newlib_tests/shell/tst_check_kconfig03.sh > new file mode 100755 > index 000000000..c5f046b79 > --- /dev/null > +++ b/lib/newlib_tests/shell/tst_check_kconfig03.sh > @@ -0,0 +1,16 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0-or-later > +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. > + > +TST_TESTFUNC=do_test > +TST_NEEDS_CMDS="tst_check_kconfigs" > +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS : CONFIG_XFS_FS" > +TST_NEEDS_KCONFIGS_IFS=":" > +. tst_test.sh > + > +do_test() > +{ > + tst_res TPASS "valid kconfig delimter" > +} > + > +tst_run > diff --git a/lib/newlib_tests/shell/tst_check_kconfig04.sh b/lib/newlib_tests/shell/tst_check_kconfig04.sh > new file mode 100644 > index 000000000..ad5e8ac21 > --- /dev/null > +++ b/lib/newlib_tests/shell/tst_check_kconfig04.sh > @@ -0,0 +1,25 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0-or-later > +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. > + > +TST_TESTFUNC=do_test > +TST_NEEDS_CMDS="tst_check_kconfigs" > +. tst_test.sh > + > +do_test() > +{ > + tst_check_kconfigs "CONFIG_EXT4_FS" > + if [ $? -eq 0 ]; then > + tst_res TPASS "kernel .config has CONFIG_EXT4_fs" ^ FS > + else > + tst_res TFAIL "kernel .config doesn't have CONFIG_EXT4_FS" > + fi > + > + tst_check_kconfigs "CONFIG_EXT4" > + if [ $? -eq 0 ]; then > + tst_res TFAIL "kernel .config has CONFIG_EXT4" > + else > + tst_res TPASS "kernel .config doesn't have CONFIG_EXT4" > + fi > +} > +tst_run > diff --git a/testcases/lib/.gitignore b/testcases/lib/.gitignore > index 9625d9043..c0d4dc851 100644 > --- a/testcases/lib/.gitignore > +++ b/testcases/lib/.gitignore > @@ -1,4 +1,5 @@ > /tst_check_drivers > +/tst_check_kconfigs > /tst_checkpoint > /tst_device > /tst_getconf > diff --git a/testcases/lib/Makefile b/testcases/lib/Makefile > index d6b4c7a91..f2de0c832 100644 > --- a/testcases/lib/Makefile > +++ b/testcases/lib/Makefile > @@ -11,6 +11,7 @@ INSTALL_TARGETS := *.sh > MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ > tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\ > 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_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ > + tst_check_kconfigs > > include $(top_srcdir)/include/mk/generic_leaf_target.mk > diff --git a/testcases/lib/tst_check_kconfigs.c b/testcases/lib/tst_check_kconfigs.c > new file mode 100644 > index 000000000..dd0c72768 > --- /dev/null > +++ b/testcases/lib/tst_check_kconfigs.c > @@ -0,0 +1,54 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.*/ > + > +#include <stdio.h> > +#include <string.h> > +#include <limits.h> > +#include <stdlib.h> > +#include "tst_kconfig.h" > + > +int main(int argc, const char *argv[]) > +{ > + char delim[2]; > + char str[PATH_MAX]; > + char *result = NULL; > + char *next = NULL; > + int i = 0, j = 0, ret = 0; > + > + if (argc < 3) { > + fprintf(stderr, "Please provide kernel kconfig list and delims\n"); > + return 1; > + } > + > + if (strlen(argv[2]) != 1) { > + fprintf(stderr, "The delim must be a single character\n"); > + return 1; > + } > + > + strcpy(str, argv[1]); > + strcpy(delim, argv[2]); > + > + result = strtok_r(str, delim, &next); > + for (i = 0; result != NULL; i++) > + result = strtok_r(NULL, delim, &next); There is no reason to parse the string like this here we can just do: char *str = argv[1]; char *delim = argv[2]; unsigned int cnt = 1; for (i = 0; str[i]; i++) { if (str[i] == delim[0]) cnt++; } > + strcpy(str, argv[1]); > + char **kconfigs = (char **)malloc(++i * sizeof(char *)); ^ useless cast > + result = strtok_r(str, delim, &next); > + for (i = 0; result != NULL; i++) { > + kconfigs[i] = (char *)malloc(sizeof(char) * strlen(result)); > + strcpy(kconfigs[i], result); > + result = strtok_r(NULL, delim, &next); > + } Also no reason to allocate anything here, we can in fact modify the argv[1] there is no reason not to, so we can do: for (i = 0; i < cnt; i++) kconfigs[i] = strtok_r(str, delim, &str); kconfigs[i] = NULL; > + kconfigs[i] = NULL; > + if (tst_kconfig_check((const char * const*)kconfigs)) > + ret = 1; > + > + for (j = 0; j <= i; j++) > + free(kconfigs[i]); > + > + free(kconfigs); > + return ret; > +} > diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh > index 2556b28f5..9c4e4dd3b 100644 > --- a/testcases/lib/tst_test.sh > +++ b/testcases/lib/tst_test.sh > @@ -412,6 +412,17 @@ tst_require_drivers() > return 0 > } > > +tst_require_kconfigs() > +{ > + [ $# -ne 2 ] && return 0 > + > + tst_check_kconfigs "$1" $2 > /dev/null > + if [ $? -ne 0 ]; then > + tst_brk TCONF "Aborting due to unsuitable kernel config, see above!" > + fi > + return 0 > +} > + > tst_is_int() > { > [ "$1" -eq "$1" ] 2>/dev/null > @@ -587,6 +598,7 @@ tst_run() > NEEDS_ROOT|NEEDS_TMPDIR|TMPDIR|NEEDS_DEVICE|DEVICE);; > NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);; > NEEDS_DRIVERS|FS_TYPE|MNTPOINT|MNT_PARAMS);; > + NEEDS_KCONFIGS|NEEDS_KCONFIGS_IFS);; > IPV6|IPV6_FLAG|IPVER|TEST_DATA|TEST_DATA_IFS);; > RETRY_FUNC|RETRY_FN_EXP_BACKOFF|TIMEOUT);; > NET_DATAROOT|NET_MAX_PKT|NET_RHOST_RUN_DEBUG|NETLOAD_CLN_NUMBER);; > @@ -627,6 +639,7 @@ tst_run() > [ "$TST_DISABLE_SELINUX" = 1 ] && tst_disable_selinux > > tst_require_cmds $TST_NEEDS_CMDS > + tst_require_kconfigs "$TST_NEEDS_KCONFIGS" $TST_NEEDS_KCONFIGS_IFS > tst_require_drivers $TST_NEEDS_DRIVERS > > if [ -n "$TST_MIN_KVER" ]; then > @@ -748,6 +761,8 @@ if [ -z "$TST_NO_DEFAULT_RUN" ]; then > > TST_TEST_DATA_IFS="${TST_TEST_DATA_IFS:- }" > > + TST_NEEDS_KCONFIGS_IFS="${TST_NEEDS_KCONFIGS_IFS:-,}" > + > if [ -n "$TST_CNT" ]; then > if ! tst_is_int "$TST_CNT"; then > tst_brk TBROK "TST_CNT must be integer" > -- > 2.23.0 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Cyril > Hi! >> Use tst_check_kconfigs command to call tst_kconfig_check function in internal. >> It introduces two variables in tst_test.sh >> TST_NEEDS_KCONFIGS >> TST_NEEDS_KCONFIGS_IFS (default value is comma) >> >> Also, we can use tst_check_kconfigs in your shell case if you want to skip subtest >> case instead the whole test. >> >> Fixes:#891 >> Suggested-by: Petr Vorel<pvorel@suse.cz> >> Suggested-by: Cyril Hrubis<chrubis@suse.cz> >> Signed-off-by: Yang Xu<xuyang2018.jy@fujitsu.com> >> --- >> doc/shell-test-api.txt | 51 ++++++++++++------ >> lib/newlib_tests/runtest.sh | 3 +- >> lib/newlib_tests/shell/tst_check_kconfig01.sh | 16 ++++++ >> lib/newlib_tests/shell/tst_check_kconfig02.sh | 15 ++++++ >> lib/newlib_tests/shell/tst_check_kconfig03.sh | 16 ++++++ >> lib/newlib_tests/shell/tst_check_kconfig04.sh | 25 +++++++++ >> testcases/lib/.gitignore | 1 + >> testcases/lib/Makefile | 3 +- >> testcases/lib/tst_check_kconfigs.c | 54 +++++++++++++++++++ >> testcases/lib/tst_test.sh | 15 ++++++ >> 10 files changed, 181 insertions(+), 18 deletions(-) >> create mode 100755 lib/newlib_tests/shell/tst_check_kconfig01.sh >> create mode 100755 lib/newlib_tests/shell/tst_check_kconfig02.sh >> create mode 100755 lib/newlib_tests/shell/tst_check_kconfig03.sh >> create mode 100644 lib/newlib_tests/shell/tst_check_kconfig04.sh >> create mode 100644 testcases/lib/tst_check_kconfigs.c >> >> diff --git a/doc/shell-test-api.txt b/doc/shell-test-api.txt >> index b993a9e1e..e082808f7 100644 >> --- a/doc/shell-test-api.txt >> +++ b/doc/shell-test-api.txt >> @@ -193,22 +193,25 @@ simply by setting right '$TST_NEEDS_FOO'. >> >> [options="header"] >> |============================================================================= >> -| Variable name | Action done >> -| 'TST_NEEDS_ROOT' | Exit the test with 'TCONF' unless executed under root. >> -| | Alternatively the 'tst_require_root' command can be used. >> -| 'TST_NEEDS_TMPDIR' | Create test temporary directory and cd into it. >> -| 'TST_NEEDS_DEVICE' | Prepare test temporary device, the path to testing >> - device is stored in '$TST_DEVICE' variable. >> - The option implies 'TST_NEEDS_TMPDIR'. >> -| 'TST_NEEDS_CMDS' | String with command names that has to be present for >> - the test (see below). >> -| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below). >> -| 'TST_NEEDS_DRIVERS'| Checks kernel drivers support for the test. >> -| 'TST_TIMEOUT' | Maximum timeout set for the test in sec. Must be int>= 1, >> - or -1 (special value to disable timeout), default is 300. >> - Variable is meant be set in tests, not by user. >> - It's an equivalent of `tst_test.timeout` in C, can be set >> - via 'tst_set_timeout(timeout)' after test has started. >> +| Variable name | Action done >> +| 'TST_NEEDS_ROOT' | Exit the test with 'TCONF' unless executed under root. >> +| | Alternatively the 'tst_require_root' command can be used. >> +| 'TST_NEEDS_TMPDIR' | Create test temporary directory and cd into it. >> +| 'TST_NEEDS_DEVICE' | Prepare test temporary device, the path to testing >> + device is stored in '$TST_DEVICE' variable. >> + The option implies 'TST_NEEDS_TMPDIR'. >> +| 'TST_NEEDS_CMDS' | String with command names that has to be present for >> + the test (see below). >> +| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below). >> +| 'TST_NEEDS_DRIVERS' | Checks kernel drivers support for the test. >> +| 'TST_NEEDS_KCONFIGS' | Checks kernel kconfigs support for the test (see below). >> +| 'TST_NEEDS_KCONFIGS_IFS' | Used for splitting '$TST_NEEDS_KCONFIGS' variable, >> + default value is comma, it only supports single character. >> +| 'TST_TIMEOUT' | Maximum timeout set for the test in sec. Must be int>= 1, >> + or -1 (special value to disable timeout), default is 300. >> + Variable is meant be set in tests, not by user. >> + It's an equivalent of `tst_test.timeout` in C, can be set >> + via 'tst_set_timeout(timeout)' after test has started. >> |============================================================================= >> >> [options="header"] >> @@ -742,3 +745,19 @@ TST_NEEDS_CHECKPOINTS=1 >> Since both the implementations are compatible, it's also possible to start >> a child binary process from a shell test and synchronize with it. This process >> must have checkpoints initialized by calling 'tst_reinit()'. >> + >> +1.7 Parsing kernel .config >> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> +The shell library provides an implementation of the kconfig parsing interface >> +compatible with the C version. >> + >> +It's possible to pass kernel kconfig list for tst_require_kconfigs API with >> +'$TST_NEEDS_KCONFIGS'. >> +Optional '$TST_NEEDS_KCONFIGS_IFS' is used for splitting, default value is comma. >> + >> +------------------------------------------------------------------------------- >> +#!/bin/sh >> +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS, CONFIG_QUOTACTL=y" >> + >> +. tst_test.sh >> +------------------------------------------------------------------------------- >> diff --git a/lib/newlib_tests/runtest.sh b/lib/newlib_tests/runtest.sh >> index 8b2fe347a..b34a582b7 100755 >> --- a/lib/newlib_tests/runtest.sh >> +++ b/lib/newlib_tests/runtest.sh >> @@ -6,7 +6,8 @@ tst_needs_cmds01 tst_needs_cmds02 tst_needs_cmds03 tst_needs_cmds06 >> tst_needs_cmds07 tst_bool_expr test_exec test_timer tst_res_hexd tst_strstatus >> tst_fuzzy_sync03 test_zero_hugepage.sh}" >> >> -LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh shell/net/*.sh}" >> +LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh >> +shell/tst_check_kconfig0[1-4].sh shell/net/*.sh}" > > It would be slightly safter to actually export the KCONFIG_PATH pointing > to one of the config files created for the C tests (config02) if we are goind to > run this in CI. > > It's very unlikely that anyone who runs these tests wouldn't have > CONFIG_EXT4_FS in but it may actually happen. Good suggestion. > >> cd $(dirname $0) >> PATH="$PWD/../../testcases/lib/:$PATH" >> diff --git a/lib/newlib_tests/shell/tst_check_kconfig01.sh b/lib/newlib_tests/shell/tst_check_kconfig01.sh >> new file mode 100755 >> index 000000000..065a20fd2 >> --- /dev/null >> +++ b/lib/newlib_tests/shell/tst_check_kconfig01.sh >> @@ -0,0 +1,16 @@ >> +#!/bin/sh >> +# SPDX-License-Identifier: GPL-2.0-or-later >> +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. >> + >> +TST_TESTFUNC=do_test >> +TST_NEEDS_CMDS="tst_check_kconfigs" > > I wouldn't bother with checking for this, it's part of the LTP it's not > an external tool that could be missing. Agree. > >> +TST_NEEDS_KCONFIGS="CONFIG_EXT4" >> + >> +. tst_test.sh >> + >> +do_test() >> +{ >> + tst_res TFAIL "kernel .config doesn't have CONFIG_EXT4" >> +} >> + >> +tst_run >> diff --git a/lib/newlib_tests/shell/tst_check_kconfig02.sh b/lib/newlib_tests/shell/tst_check_kconfig02.sh >> new file mode 100755 >> index 000000000..3a0f05847 >> --- /dev/null >> +++ b/lib/newlib_tests/shell/tst_check_kconfig02.sh >> @@ -0,0 +1,15 @@ >> +#!/bin/sh >> +# SPDX-License-Identifier: GPL-2.0-or-later >> +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. >> + >> +TST_TESTFUNC=do_test >> +TST_NEEDS_CMDS="tst_check_kconfigs" >> +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS : CONFIG_XFS_FS" >> +. tst_test.sh >> + >> +do_test() >> +{ >> + tst_res TFAIL "invalid kconfig delimter" >> +} >> + >> +tst_run >> diff --git a/lib/newlib_tests/shell/tst_check_kconfig03.sh b/lib/newlib_tests/shell/tst_check_kconfig03.sh >> new file mode 100755 >> index 000000000..c5f046b79 >> --- /dev/null >> +++ b/lib/newlib_tests/shell/tst_check_kconfig03.sh >> @@ -0,0 +1,16 @@ >> +#!/bin/sh >> +# SPDX-License-Identifier: GPL-2.0-or-later >> +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. >> + >> +TST_TESTFUNC=do_test >> +TST_NEEDS_CMDS="tst_check_kconfigs" >> +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS : CONFIG_XFS_FS" >> +TST_NEEDS_KCONFIGS_IFS=":" >> +. tst_test.sh >> + >> +do_test() >> +{ >> + tst_res TPASS "valid kconfig delimter" >> +} >> + >> +tst_run >> diff --git a/lib/newlib_tests/shell/tst_check_kconfig04.sh b/lib/newlib_tests/shell/tst_check_kconfig04.sh >> new file mode 100644 >> index 000000000..ad5e8ac21 >> --- /dev/null >> +++ b/lib/newlib_tests/shell/tst_check_kconfig04.sh >> @@ -0,0 +1,25 @@ >> +#!/bin/sh >> +# SPDX-License-Identifier: GPL-2.0-or-later >> +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. >> + >> +TST_TESTFUNC=do_test >> +TST_NEEDS_CMDS="tst_check_kconfigs" >> +. tst_test.sh >> + >> +do_test() >> +{ >> + tst_check_kconfigs "CONFIG_EXT4_FS" >> + if [ $? -eq 0 ]; then >> + tst_res TPASS "kernel .config has CONFIG_EXT4_fs" > ^ > FS Will fix. >> + else >> + tst_res TFAIL "kernel .config doesn't have CONFIG_EXT4_FS" >> + fi >> + >> + tst_check_kconfigs "CONFIG_EXT4" >> + if [ $? -eq 0 ]; then >> + tst_res TFAIL "kernel .config has CONFIG_EXT4" >> + else >> + tst_res TPASS "kernel .config doesn't have CONFIG_EXT4" >> + fi >> +} >> +tst_run >> diff --git a/testcases/lib/.gitignore b/testcases/lib/.gitignore >> index 9625d9043..c0d4dc851 100644 >> --- a/testcases/lib/.gitignore >> +++ b/testcases/lib/.gitignore >> @@ -1,4 +1,5 @@ >> /tst_check_drivers >> +/tst_check_kconfigs >> /tst_checkpoint >> /tst_device >> /tst_getconf >> diff --git a/testcases/lib/Makefile b/testcases/lib/Makefile >> index d6b4c7a91..f2de0c832 100644 >> --- a/testcases/lib/Makefile >> +++ b/testcases/lib/Makefile >> @@ -11,6 +11,7 @@ INSTALL_TARGETS := *.sh >> MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ >> tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\ >> 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_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ >> + tst_check_kconfigs >> >> include $(top_srcdir)/include/mk/generic_leaf_target.mk >> diff --git a/testcases/lib/tst_check_kconfigs.c b/testcases/lib/tst_check_kconfigs.c >> new file mode 100644 >> index 000000000..dd0c72768 >> --- /dev/null >> +++ b/testcases/lib/tst_check_kconfigs.c >> @@ -0,0 +1,54 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +/* Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.*/ >> + >> +#include<stdio.h> >> +#include<string.h> >> +#include<limits.h> >> +#include<stdlib.h> >> +#include "tst_kconfig.h" >> + >> +int main(int argc, const char *argv[]) >> +{ >> + char delim[2]; >> + char str[PATH_MAX]; >> + char *result = NULL; >> + char *next = NULL; >> + int i = 0, j = 0, ret = 0; >> + >> + if (argc< 3) { >> + fprintf(stderr, "Please provide kernel kconfig list and delims\n"); >> + return 1; >> + } >> + >> + if (strlen(argv[2]) != 1) { >> + fprintf(stderr, "The delim must be a single character\n"); >> + return 1; >> + } >> + >> + strcpy(str, argv[1]); >> + strcpy(delim, argv[2]); >> + >> + result = strtok_r(str, delim,&next); >> + for (i = 0; result != NULL; i++) >> + result = strtok_r(NULL, delim,&next); > > There is no reason to parse the string like this here we can just do: > > char *str = argv[1]; > char *delim = argv[2]; > unsigned int cnt = 1; > > for (i = 0; str[i]; i++) { > if (str[i] == delim[0]) > cnt++; > } > >> + strcpy(str, argv[1]); >> + char **kconfigs = (char **)malloc(++i * sizeof(char *)); > ^ > useless cast > >> + result = strtok_r(str, delim,&next); >> + for (i = 0; result != NULL; i++) { >> + kconfigs[i] = (char *)malloc(sizeof(char) * strlen(result)); >> + strcpy(kconfigs[i], result); >> + result = strtok_r(NULL, delim,&next); >> + } > > Also no reason to allocate anything here, we can in fact modify the > argv[1] there is no reason not to, so we can do: > > for (i = 0; i< cnt; i++) > kconfigs[i] = strtok_r(str, delim,&str); > > kconfigs[i] = NULL; > > Will do it in v5. Best Regards Yang Xu >> + kconfigs[i] = NULL; >> + if (tst_kconfig_check((const char * const*)kconfigs)) >> + ret = 1; >> + >> + for (j = 0; j<= i; j++) >> + free(kconfigs[i]); >> + >> + free(kconfigs); >> + return ret; >> +} >> diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh >> index 2556b28f5..9c4e4dd3b 100644 >> --- a/testcases/lib/tst_test.sh >> +++ b/testcases/lib/tst_test.sh >> @@ -412,6 +412,17 @@ tst_require_drivers() >> return 0 >> } >> >> +tst_require_kconfigs() >> +{ >> + [ $# -ne 2 ]&& return 0 >> + >> + tst_check_kconfigs "$1" $2> /dev/null >> + if [ $? -ne 0 ]; then >> + tst_brk TCONF "Aborting due to unsuitable kernel config, see above!" >> + fi >> + return 0 >> +} >> + >> tst_is_int() >> { >> [ "$1" -eq "$1" ] 2>/dev/null >> @@ -587,6 +598,7 @@ tst_run() >> NEEDS_ROOT|NEEDS_TMPDIR|TMPDIR|NEEDS_DEVICE|DEVICE);; >> NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);; >> NEEDS_DRIVERS|FS_TYPE|MNTPOINT|MNT_PARAMS);; >> + NEEDS_KCONFIGS|NEEDS_KCONFIGS_IFS);; >> IPV6|IPV6_FLAG|IPVER|TEST_DATA|TEST_DATA_IFS);; >> RETRY_FUNC|RETRY_FN_EXP_BACKOFF|TIMEOUT);; >> NET_DATAROOT|NET_MAX_PKT|NET_RHOST_RUN_DEBUG|NETLOAD_CLN_NUMBER);; >> @@ -627,6 +639,7 @@ tst_run() >> [ "$TST_DISABLE_SELINUX" = 1 ]&& tst_disable_selinux >> >> tst_require_cmds $TST_NEEDS_CMDS >> + tst_require_kconfigs "$TST_NEEDS_KCONFIGS" $TST_NEEDS_KCONFIGS_IFS >> tst_require_drivers $TST_NEEDS_DRIVERS >> >> if [ -n "$TST_MIN_KVER" ]; then >> @@ -748,6 +761,8 @@ if [ -z "$TST_NO_DEFAULT_RUN" ]; then >> >> TST_TEST_DATA_IFS="${TST_TEST_DATA_IFS:- }" >> >> + TST_NEEDS_KCONFIGS_IFS="${TST_NEEDS_KCONFIGS_IFS:-,}" >> + >> if [ -n "$TST_CNT" ]; then >> if ! tst_is_int "$TST_CNT"; then >> tst_brk TBROK "TST_CNT must be integer" >> -- >> 2.23.0 >> >> >> -- >> Mailing list info: https://lists.linux.it/listinfo/ltp >
diff --git a/doc/shell-test-api.txt b/doc/shell-test-api.txt index b993a9e1e..e082808f7 100644 --- a/doc/shell-test-api.txt +++ b/doc/shell-test-api.txt @@ -193,22 +193,25 @@ simply by setting right '$TST_NEEDS_FOO'. [options="header"] |============================================================================= -| Variable name | Action done -| 'TST_NEEDS_ROOT' | Exit the test with 'TCONF' unless executed under root. -| | Alternatively the 'tst_require_root' command can be used. -| 'TST_NEEDS_TMPDIR' | Create test temporary directory and cd into it. -| 'TST_NEEDS_DEVICE' | Prepare test temporary device, the path to testing - device is stored in '$TST_DEVICE' variable. - The option implies 'TST_NEEDS_TMPDIR'. -| 'TST_NEEDS_CMDS' | String with command names that has to be present for - the test (see below). -| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below). -| 'TST_NEEDS_DRIVERS'| Checks kernel drivers support for the test. -| 'TST_TIMEOUT' | Maximum timeout set for the test in sec. Must be int >= 1, - or -1 (special value to disable timeout), default is 300. - Variable is meant be set in tests, not by user. - It's an equivalent of `tst_test.timeout` in C, can be set - via 'tst_set_timeout(timeout)' after test has started. +| Variable name | Action done +| 'TST_NEEDS_ROOT' | Exit the test with 'TCONF' unless executed under root. +| | Alternatively the 'tst_require_root' command can be used. +| 'TST_NEEDS_TMPDIR' | Create test temporary directory and cd into it. +| 'TST_NEEDS_DEVICE' | Prepare test temporary device, the path to testing + device is stored in '$TST_DEVICE' variable. + The option implies 'TST_NEEDS_TMPDIR'. +| 'TST_NEEDS_CMDS' | String with command names that has to be present for + the test (see below). +| 'TST_NEEDS_MODULE' | Test module name needed for the test (see below). +| 'TST_NEEDS_DRIVERS' | Checks kernel drivers support for the test. +| 'TST_NEEDS_KCONFIGS' | Checks kernel kconfigs support for the test (see below). +| 'TST_NEEDS_KCONFIGS_IFS' | Used for splitting '$TST_NEEDS_KCONFIGS' variable, + default value is comma, it only supports single character. +| 'TST_TIMEOUT' | Maximum timeout set for the test in sec. Must be int >= 1, + or -1 (special value to disable timeout), default is 300. + Variable is meant be set in tests, not by user. + It's an equivalent of `tst_test.timeout` in C, can be set + via 'tst_set_timeout(timeout)' after test has started. |============================================================================= [options="header"] @@ -742,3 +745,19 @@ TST_NEEDS_CHECKPOINTS=1 Since both the implementations are compatible, it's also possible to start a child binary process from a shell test and synchronize with it. This process must have checkpoints initialized by calling 'tst_reinit()'. + +1.7 Parsing kernel .config +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +The shell library provides an implementation of the kconfig parsing interface +compatible with the C version. + +It's possible to pass kernel kconfig list for tst_require_kconfigs API with +'$TST_NEEDS_KCONFIGS'. +Optional '$TST_NEEDS_KCONFIGS_IFS' is used for splitting, default value is comma. + +------------------------------------------------------------------------------- +#!/bin/sh +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS, CONFIG_QUOTACTL=y" + +. tst_test.sh +------------------------------------------------------------------------------- diff --git a/lib/newlib_tests/runtest.sh b/lib/newlib_tests/runtest.sh index 8b2fe347a..b34a582b7 100755 --- a/lib/newlib_tests/runtest.sh +++ b/lib/newlib_tests/runtest.sh @@ -6,7 +6,8 @@ tst_needs_cmds01 tst_needs_cmds02 tst_needs_cmds03 tst_needs_cmds06 tst_needs_cmds07 tst_bool_expr test_exec test_timer tst_res_hexd tst_strstatus tst_fuzzy_sync03 test_zero_hugepage.sh}" -LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh shell/net/*.sh}" +LTP_SHELL_API_TESTS="${LTP_SHELL_API_TESTS:-shell/tst_check_driver.sh +shell/tst_check_kconfig0[1-4].sh shell/net/*.sh}" cd $(dirname $0) PATH="$PWD/../../testcases/lib/:$PATH" diff --git a/lib/newlib_tests/shell/tst_check_kconfig01.sh b/lib/newlib_tests/shell/tst_check_kconfig01.sh new file mode 100755 index 000000000..065a20fd2 --- /dev/null +++ b/lib/newlib_tests/shell/tst_check_kconfig01.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. + +TST_TESTFUNC=do_test +TST_NEEDS_CMDS="tst_check_kconfigs" +TST_NEEDS_KCONFIGS="CONFIG_EXT4" + +. tst_test.sh + +do_test() +{ + tst_res TFAIL "kernel .config doesn't have CONFIG_EXT4" +} + +tst_run diff --git a/lib/newlib_tests/shell/tst_check_kconfig02.sh b/lib/newlib_tests/shell/tst_check_kconfig02.sh new file mode 100755 index 000000000..3a0f05847 --- /dev/null +++ b/lib/newlib_tests/shell/tst_check_kconfig02.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. + +TST_TESTFUNC=do_test +TST_NEEDS_CMDS="tst_check_kconfigs" +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS : CONFIG_XFS_FS" +. tst_test.sh + +do_test() +{ + tst_res TFAIL "invalid kconfig delimter" +} + +tst_run diff --git a/lib/newlib_tests/shell/tst_check_kconfig03.sh b/lib/newlib_tests/shell/tst_check_kconfig03.sh new file mode 100755 index 000000000..c5f046b79 --- /dev/null +++ b/lib/newlib_tests/shell/tst_check_kconfig03.sh @@ -0,0 +1,16 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. + +TST_TESTFUNC=do_test +TST_NEEDS_CMDS="tst_check_kconfigs" +TST_NEEDS_KCONFIGS="CONFIG_EXT4_FS : CONFIG_XFS_FS" +TST_NEEDS_KCONFIGS_IFS=":" +. tst_test.sh + +do_test() +{ + tst_res TPASS "valid kconfig delimter" +} + +tst_run diff --git a/lib/newlib_tests/shell/tst_check_kconfig04.sh b/lib/newlib_tests/shell/tst_check_kconfig04.sh new file mode 100644 index 000000000..ad5e8ac21 --- /dev/null +++ b/lib/newlib_tests/shell/tst_check_kconfig04.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2022 FUJITSU LIMITED. All rights reserved. + +TST_TESTFUNC=do_test +TST_NEEDS_CMDS="tst_check_kconfigs" +. tst_test.sh + +do_test() +{ + tst_check_kconfigs "CONFIG_EXT4_FS" + if [ $? -eq 0 ]; then + tst_res TPASS "kernel .config has CONFIG_EXT4_fs" + else + tst_res TFAIL "kernel .config doesn't have CONFIG_EXT4_FS" + fi + + tst_check_kconfigs "CONFIG_EXT4" + if [ $? -eq 0 ]; then + tst_res TFAIL "kernel .config has CONFIG_EXT4" + else + tst_res TPASS "kernel .config doesn't have CONFIG_EXT4" + fi +} +tst_run diff --git a/testcases/lib/.gitignore b/testcases/lib/.gitignore index 9625d9043..c0d4dc851 100644 --- a/testcases/lib/.gitignore +++ b/testcases/lib/.gitignore @@ -1,4 +1,5 @@ /tst_check_drivers +/tst_check_kconfigs /tst_checkpoint /tst_device /tst_getconf diff --git a/testcases/lib/Makefile b/testcases/lib/Makefile index d6b4c7a91..f2de0c832 100644 --- a/testcases/lib/Makefile +++ b/testcases/lib/Makefile @@ -11,6 +11,7 @@ INSTALL_TARGETS := *.sh MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\ 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_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ + tst_check_kconfigs include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/lib/tst_check_kconfigs.c b/testcases/lib/tst_check_kconfigs.c new file mode 100644 index 000000000..dd0c72768 --- /dev/null +++ b/testcases/lib/tst_check_kconfigs.c @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (c) 2022 FUJITSU LIMITED. All rights reserved.*/ + +#include <stdio.h> +#include <string.h> +#include <limits.h> +#include <stdlib.h> +#include "tst_kconfig.h" + +int main(int argc, const char *argv[]) +{ + char delim[2]; + char str[PATH_MAX]; + char *result = NULL; + char *next = NULL; + int i = 0, j = 0, ret = 0; + + if (argc < 3) { + fprintf(stderr, "Please provide kernel kconfig list and delims\n"); + return 1; + } + + if (strlen(argv[2]) != 1) { + fprintf(stderr, "The delim must be a single character\n"); + return 1; + } + + strcpy(str, argv[1]); + strcpy(delim, argv[2]); + + result = strtok_r(str, delim, &next); + for (i = 0; result != NULL; i++) + result = strtok_r(NULL, delim, &next); + + strcpy(str, argv[1]); + char **kconfigs = (char **)malloc(++i * sizeof(char *)); + + result = strtok_r(str, delim, &next); + for (i = 0; result != NULL; i++) { + kconfigs[i] = (char *)malloc(sizeof(char) * strlen(result)); + strcpy(kconfigs[i], result); + result = strtok_r(NULL, delim, &next); + } + + kconfigs[i] = NULL; + if (tst_kconfig_check((const char * const*)kconfigs)) + ret = 1; + + for (j = 0; j <= i; j++) + free(kconfigs[i]); + + free(kconfigs); + return ret; +} diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index 2556b28f5..9c4e4dd3b 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -412,6 +412,17 @@ tst_require_drivers() return 0 } +tst_require_kconfigs() +{ + [ $# -ne 2 ] && return 0 + + tst_check_kconfigs "$1" $2 > /dev/null + if [ $? -ne 0 ]; then + tst_brk TCONF "Aborting due to unsuitable kernel config, see above!" + fi + return 0 +} + tst_is_int() { [ "$1" -eq "$1" ] 2>/dev/null @@ -587,6 +598,7 @@ tst_run() NEEDS_ROOT|NEEDS_TMPDIR|TMPDIR|NEEDS_DEVICE|DEVICE);; NEEDS_CMDS|NEEDS_MODULE|MODPATH|DATAROOT);; NEEDS_DRIVERS|FS_TYPE|MNTPOINT|MNT_PARAMS);; + NEEDS_KCONFIGS|NEEDS_KCONFIGS_IFS);; IPV6|IPV6_FLAG|IPVER|TEST_DATA|TEST_DATA_IFS);; RETRY_FUNC|RETRY_FN_EXP_BACKOFF|TIMEOUT);; NET_DATAROOT|NET_MAX_PKT|NET_RHOST_RUN_DEBUG|NETLOAD_CLN_NUMBER);; @@ -627,6 +639,7 @@ tst_run() [ "$TST_DISABLE_SELINUX" = 1 ] && tst_disable_selinux tst_require_cmds $TST_NEEDS_CMDS + tst_require_kconfigs "$TST_NEEDS_KCONFIGS" $TST_NEEDS_KCONFIGS_IFS tst_require_drivers $TST_NEEDS_DRIVERS if [ -n "$TST_MIN_KVER" ]; then @@ -748,6 +761,8 @@ if [ -z "$TST_NO_DEFAULT_RUN" ]; then TST_TEST_DATA_IFS="${TST_TEST_DATA_IFS:- }" + TST_NEEDS_KCONFIGS_IFS="${TST_NEEDS_KCONFIGS_IFS:-,}" + if [ -n "$TST_CNT" ]; then if ! tst_is_int "$TST_CNT"; then tst_brk TBROK "TST_CNT must be integer"
Use tst_check_kconfigs command to call tst_kconfig_check function in internal. It introduces two variables in tst_test.sh TST_NEEDS_KCONFIGS TST_NEEDS_KCONFIGS_IFS (default value is comma) Also, we can use tst_check_kconfigs in your shell case if you want to skip subtest case instead the whole test. Fixes:#891 Suggested-by: Petr Vorel <pvorel@suse.cz> Suggested-by: Cyril Hrubis <chrubis@suse.cz> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- doc/shell-test-api.txt | 51 ++++++++++++------ lib/newlib_tests/runtest.sh | 3 +- lib/newlib_tests/shell/tst_check_kconfig01.sh | 16 ++++++ lib/newlib_tests/shell/tst_check_kconfig02.sh | 15 ++++++ lib/newlib_tests/shell/tst_check_kconfig03.sh | 16 ++++++ lib/newlib_tests/shell/tst_check_kconfig04.sh | 25 +++++++++ testcases/lib/.gitignore | 1 + testcases/lib/Makefile | 3 +- testcases/lib/tst_check_kconfigs.c | 54 +++++++++++++++++++ testcases/lib/tst_test.sh | 15 ++++++ 10 files changed, 181 insertions(+), 18 deletions(-) create mode 100755 lib/newlib_tests/shell/tst_check_kconfig01.sh create mode 100755 lib/newlib_tests/shell/tst_check_kconfig02.sh create mode 100755 lib/newlib_tests/shell/tst_check_kconfig03.sh create mode 100644 lib/newlib_tests/shell/tst_check_kconfig04.sh create mode 100644 testcases/lib/tst_check_kconfigs.c