Commit c388c992 authored by Zhangjin Wu's avatar Zhangjin Wu Committed by Willy Tarreau

selftests/nolibc: fix up kernel parameters support

kernel parameters allow pass two types of strings, one type is like
'noapic', another type is like 'panic=5', the first type is passed as
arguments of the init program, the second type is passed as environment
variables of the init program.

when users pass kernel parameters like this:

    noapic NOLIBC_TEST=syscall

our nolibc-test program will use the test setting from argv[1] and
ignore the one from NOLIBC_TEST environment variable, and at last, it
will print the following line and ignore the whole test setting.

    Ignoring unknown test name 'noapic'

reversing the parsing order does solve the above issue:

    test = getenv("NOLIBC_TEST");
    if (test)
        test = argv[1];

but it still doesn't work with such kernel parameters (without
NOLIBC_TEST environment variable):

    noapic FOO=bar

To support all of the potential kernel parameters, let's verify the test
setting from both of argv[1] and NOLIBC_TEST environment variable.
Reviewed-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarZhangjin Wu <falcon@tinylab.org>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 950add28
......@@ -1073,6 +1073,35 @@ static const struct test test_names[] = {
{ 0 }
};
int is_setting_valid(char *test)
{
int idx, len, test_len, valid = 0;
char delimiter;
if (!test)
return valid;
test_len = strlen(test);
for (idx = 0; test_names[idx].name; idx++) {
len = strlen(test_names[idx].name);
if (test_len < len)
continue;
if (strncmp(test, test_names[idx].name, len) != 0)
continue;
delimiter = test[len];
if (delimiter != ':' && delimiter != ',' && delimiter != '\0')
continue;
valid = 1;
break;
}
return valid;
}
int main(int argc, char **argv, char **envp)
{
int min = 0;
......@@ -1099,10 +1128,10 @@ int main(int argc, char **argv, char **envp)
* syscall:5-15[:.*],stdlib:8-10
*/
test = argv[1];
if (!test)
if (!is_setting_valid(test))
test = getenv("NOLIBC_TEST");
if (test) {
if (is_setting_valid(test)) {
char *comma, *colon, *dash, *value;
do {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment