@@ -53,6 +53,6 @@ void tst_kconfig_read(struct tst_kconfig_var vars[], size_t vars_len);
*
* @param kconfigs NULL-terminated array of config strings needed for the testrun.
*/
-void tst_kconfig_check(const char *const kconfigs[]);
+int tst_kconfig_check(const char *const kconfigs[]);
#endif /* TST_KCONFIG_H__ */
@@ -478,22 +478,26 @@ static void dump_vars(const struct tst_expr *expr)
}
}
-void tst_kconfig_check(const char *const kconfigs[])
+int tst_kconfig_check(const char *const kconfigs[])
{
size_t expr_cnt = array_len(kconfigs);
struct tst_expr *exprs[expr_cnt];
unsigned int i, var_cnt;
- int abort_test = 0;
+ int ret = 0;
for (i = 0; i < expr_cnt; i++) {
exprs[i] = tst_bool_expr_parse(kconfigs[i]);
- if (!exprs[i])
- tst_brk(TBROK, "Invalid kconfig expression!");
+ if (!exprs[i]) {
+ tst_res(TWARN, "Invalid kconfig expression!");
+ return 1;
+ }
}
- if (validate_vars(exprs, expr_cnt))
- tst_brk(TBROK, "Invalid kconfig variables!");
+ if (validate_vars(exprs, expr_cnt)) {
+ tst_res(TWARN, "Invalid kconfig variables!");
+ return 1;
+ }
var_cnt = get_var_cnt(exprs, expr_cnt);
struct tst_kconfig_var vars[var_cnt];
@@ -506,7 +510,7 @@ void tst_kconfig_check(const char *const kconfigs[])
int val = tst_bool_expr_eval(exprs[i], map);
if (val != 1) {
- abort_test = 1;
+ ret = 1;
tst_res(TINFO, "Constraint '%s' not satisfied!", kconfigs[i]);
dump_vars(exprs[i]);
}
@@ -519,8 +523,7 @@ void tst_kconfig_check(const char *const kconfigs[])
free(vars[i].val);
}
- if (abort_test)
- tst_brk(TCONF, "Aborting due to unsuitable kernel config, see above!");
+ return ret;
}
char tst_kconfig_get(const char *confname)
@@ -1016,8 +1016,8 @@ static void do_setup(int argc, char *argv[])
if (tst_test->tconf_msg)
tst_brk(TCONF, "%s", tst_test->tconf_msg);
- if (tst_test->needs_kconfigs)
- tst_kconfig_check(tst_test->needs_kconfigs);
+ if (tst_test->needs_kconfigs && tst_kconfig_check(tst_test->needs_kconfigs))
+ tst_brk(TCONF, "Aborting due to unsuitable kernel config, see above!");
assert_test_fn();
So this function can be used to detect whether the function succeeded in shell api by its return value. Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- include/tst_kconfig.h | 2 +- lib/tst_kconfig.c | 21 ++++++++++++--------- lib/tst_test.c | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-)