Skip to content

Commit

Permalink
tests: posix: common: separate posix c_lib_ext to standalone test
Browse files Browse the repository at this point in the history 
posix.common contains testsuites that can be separated into smaller
groups of tests. This change moves fnmatch, getopt and getentropy
into a singular testsuite at tests/posix/c_lib_ext app directory.

Signed-off-by: Marvin Ouma <pancakesdeath@protonmail.com>
  • Loading branch information
@Pancakem
Pancakem committed Nov 15, 2024
1 parent 5f418f5 commit 232585b
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 177 deletions.
9 changes: 9 additions & 0 deletions tests/posix/c_lib_ext/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# SPDX-License-Identifier: Apache-2.0

cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(posix_c_lib_ext)

target_sources(app PRIVATE src/main.c)

target_compile_options(app PRIVATE -U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=200809L)
5 changes: 5 additions & 0 deletions tests/posix/c_lib_ext/prj.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CONFIG_POSIX_API=y
CONFIG_ZTEST=y

CONFIG_POSIX_AEP_CHOICE_BASE=y
CONFIG_POSIX_C_LIB_EXT=y
4 changes: 1 addition & 3 deletions tests/posix/common/src/fnmatch.c → tests/posix/c_lib_ext/src/fnmatch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Adapted from
* https://git.musl-libc.org/cgit/libc-testsuite/tree/fnmatch.c
*/
ZTEST(fnmatch, test_fnmatch)
ZTEST(posix_c_lib_ext, test_fnmatch)
{
/* Note: commented out lines indicate known problems to be addressed in #55186 */

Expand Down Expand Up @@ -82,5 +82,3 @@ ZTEST(fnmatch, test_fnmatch)
zassert_ok(fnmatch("a*b", "a.b", FNM_PATHNAME | FNM_PERIOD));
zassert_ok(fnmatch("a[.]b", "a.b", FNM_PATHNAME | FNM_PERIOD));
}

ZTEST_SUITE(fnmatch, NULL, NULL, NULL, NULL, NULL);
16 changes: 7 additions & 9 deletions tests/posix/getentropy/src/main.c → tests/posix/c_lib_ext/src/getentropy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@

#include <zephyr/posix/unistd.h>

ZTEST(getentropy_test_suite, test_getentropy_too_large)
ZTEST(posix_c_lib_ext, test_getentropy_too_large)
{
uint8_t buf[256 + 1] = { 0 };
uint8_t buf[256 + 1] = {0};
int ret;

ret = getentropy(buf, sizeof(buf));
zassert_equal(ret, -1);
zassert_equal(errno, EIO);
}

ZTEST(getentropy_test_suite, test_getentropy_null_buffer)
ZTEST(posix_c_lib_ext, test_getentropy_null_buffer)
{
int ret;

Expand All @@ -27,18 +27,18 @@ ZTEST(getentropy_test_suite, test_getentropy_null_buffer)
zassert_equal(errno, EFAULT);
}

ZTEST(getentropy_test_suite, test_getentropy_max_size)
ZTEST(posix_c_lib_ext, test_getentropy_max_size)
{
uint8_t buf[256] = { 0 };
uint8_t buf[256] = {0};
int ret;

ret = getentropy(buf, sizeof(buf));
zassert_equal(ret, 0);
}

ZTEST(getentropy_test_suite, test_getentropy)
ZTEST(posix_c_lib_ext, test_getentropy)
{
uint8_t zero[16] = { 0 };
uint8_t zero[16] = {0};
uint8_t buf1[16];
uint8_t buf2[16];
int ret;
Expand All @@ -53,5 +53,3 @@ ZTEST(getentropy_test_suite, test_getentropy)
zassert_true(memcmp(buf2, zero, sizeof(zero)) != 0);
zassert_true(memcmp(buf1, buf2, sizeof(buf1)) != 0);
}

ZTEST_SUITE(getentropy_test_suite, NULL, NULL, NULL, NULL, NULL);
153 changes: 55 additions & 98 deletions tests/posix/getopt/src/main.c → tests/posix/c_lib_ext/src/getopt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,10 @@
#include <zephyr/posix/unistd.h>
#include <getopt.h>

ZTEST_SUITE(getopt_test_suite, NULL, NULL, NULL, NULL, NULL);

ZTEST(getopt_test_suite, test_getopt_basic)
ZTEST(posix_c_lib_ext, test_getopt_basic)
{
static const char *const nargv[] = {
"cmd_name",
"-b",
"-a",
"-h",
"-c",
"-l",
"-h",
"-a",
"-i",
"-w",
"cmd_name", "-b", "-a", "-h", "-c", "-l", "-h", "-a", "-i", "-w",
};
static const char *accepted_opt = "abchw";
static const char *expected = "bahc?ha?w";
Expand Down Expand Up @@ -63,7 +52,7 @@ enum getopt_idx {
GETOPT_IDX_OPTARG
};

ZTEST(getopt_test_suite, test_getopt)
ZTEST(posix_c_lib_ext, test_getopt)
{
struct getopt_state *state;
static const char *test_opts = "ac:";
Expand Down Expand Up @@ -96,8 +85,7 @@ ZTEST(getopt_test_suite, test_getopt)
zassert_equal(0, strcmp(argv[GETOPT_IDX_OPTARG], state->optarg),
"unexpected optarg result");
/* Non thread safe usage: */
zassert_equal(0, strcmp(argv[GETOPT_IDX_OPTARG], optarg),
"unexpected optarg result");
zassert_equal(0, strcmp(argv[GETOPT_IDX_OPTARG], optarg), "unexpected optarg result");
}

enum getopt_long_idx {
Expand All @@ -107,7 +95,7 @@ enum getopt_long_idx {
GETOPT_LONG_IDX_OPTARG
};

ZTEST(getopt_test_suite, test_getopt_long)
ZTEST(posix_c_lib_ext, test_getopt_long)
{
/* Below test is based on example
* https://www.gnu.org/software/libc/manual/html_node/Getopt-Long-Option-Example.html
Expand All @@ -118,19 +106,17 @@ ZTEST(getopt_test_suite, test_getopt_long)
int option_index = 0;
char **argv;
int c;
struct option long_options[] = {
/* These options set a flag. */
{"verbose", no_argument, &verbose_flag, 1},
{"brief", no_argument, &verbose_flag, 0},
/* These options don’t set a flag.
* We distinguish them by their indices.
*/
{"add", no_argument, 0, 'a'},
{"create", required_argument, 0, 'c'},
{"delete", required_argument, 0, 'd'},
{"long", required_argument, 0, 'e'},
{0, 0, 0, 0}
};
struct option long_options[] = {/* These options set a flag. */
{"verbose", no_argument, &verbose_flag, 1},
{"brief", no_argument, &verbose_flag, 0},
/* These options don’t set a flag.
* We distinguish them by their indices.
*/
{"add", no_argument, 0, 'a'},
{"create", required_argument, 0, 'c'},
{"delete", required_argument, 0, 'd'},
{"long", required_argument, 0, 'e'},
{0, 0, 0, 0}};
static const char *accepted_opt = "ac:d:e:";

static const char *const argv1[] = {
Expand Down Expand Up @@ -170,64 +156,51 @@ ZTEST(getopt_test_suite, test_getopt_long)
/* Get state of the current thread */
getopt_init();
argv = (char **)argv1;
c = getopt_long(argc1, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc1, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 1, "verbose flag expected");
c = getopt_long(argc1, argv, accepted_opt, long_options, &option_index);
state = getopt_state_get();
zassert_equal('c', c, "unexpected option");
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]),
"unexpected optarg");
c = getopt_long(argc1, argv, accepted_opt,
long_options, &option_index);
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]), "unexpected optarg");
c = getopt_long(argc1, argv, accepted_opt, long_options, &option_index);
zassert_equal(-1, c, "getopt_long shall return -1");

/* Test scenario 2 */
argv = (char **)argv2;
getopt_init();
c = getopt_long(argc2, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc2, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 0, "verbose flag expected");
c = getopt_long(argc2, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc2, argv, accepted_opt, long_options, &option_index);
zassert_equal('d', c, "unexpected option");
state = getopt_state_get();
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]),
"unexpected optarg");
c = getopt_long(argc2, argv, accepted_opt,
long_options, &option_index);
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]), "unexpected optarg");
c = getopt_long(argc2, argv, accepted_opt, long_options, &option_index);
zassert_equal(-1, c, "getopt_long shall return -1");

/* Test scenario 3 */
argv = (char **)argv3;
getopt_init();
c = getopt_long(argc3, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc3, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 0, "verbose flag expected");
c = getopt_long(argc3, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc3, argv, accepted_opt, long_options, &option_index);
zassert_equal('a', c, "unexpected option");
c = getopt_long(argc3, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc3, argv, accepted_opt, long_options, &option_index);
zassert_equal(-1, c, "getopt_long shall return -1");

/* Test scenario 4 */
argv = (char **)argv4;
getopt_init();
c = getopt_long(argc4, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc4, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 0, "verbose flag expected");
c = getopt_long(argc4, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc4, argv, accepted_opt, long_options, &option_index);
/* Function was called with option '-l'. It is expected it will be
* NOT evaluated to '--long' which has flag 'e'.
*/
zassert_not_equal('e', c, "unexpected option match");
c = getopt_long(argc4, argv, accepted_opt,
long_options, &option_index);
c = getopt_long(argc4, argv, accepted_opt, long_options, &option_index);
}

ZTEST(getopt_test_suite, test_getopt_long_only)
ZTEST(posix_c_lib_ext, test_getopt_long_only)
{
/* Below test is based on example
* https://www.gnu.org/software/libc/manual/html_node/Getopt-Long-Option-Example.html
Expand All @@ -238,19 +211,17 @@ ZTEST(getopt_test_suite, test_getopt_long_only)
int option_index = 0;
char **argv;
int c;
struct option long_options[] = {
/* These options set a flag. */
{"verbose", no_argument, &verbose_flag, 1},
{"brief", no_argument, &verbose_flag, 0},
/* These options don’t set a flag.
* We distinguish them by their indices.
*/
{"add", no_argument, 0, 'a'},
{"create", required_argument, 0, 'c'},
{"delete", required_argument, 0, 'd'},
{"long", required_argument, 0, 'e'},
{0, 0, 0, 0}
};
struct option long_options[] = {/* These options set a flag. */
{"verbose", no_argument, &verbose_flag, 1},
{"brief", no_argument, &verbose_flag, 0},
/* These options don’t set a flag.
* We distinguish them by their indices.
*/
{"add", no_argument, 0, 'a'},
{"create", required_argument, 0, 'c'},
{"delete", required_argument, 0, 'd'},
{"long", required_argument, 0, 'e'},
{0, 0, 0, 0}};
static const char *accepted_opt = "ac:d:e:";

static const char *const argv1[] = {
Expand Down Expand Up @@ -289,62 +260,48 @@ ZTEST(getopt_test_suite, test_getopt_long_only)
/* Test scenario 1 */
argv = (char **)argv1;
getopt_init();
c = getopt_long_only(argc1, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc1, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 1, "verbose flag expected");
c = getopt_long_only(argc1, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc1, argv, accepted_opt, long_options, &option_index);
state = getopt_state_get();
zassert_equal('c', c, "unexpected option");
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]),
"unexpected optarg");
c = getopt_long_only(argc1, argv, accepted_opt,
long_options, &option_index);
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]), "unexpected optarg");
c = getopt_long_only(argc1, argv, accepted_opt, long_options, &option_index);
zassert_equal(-1, c, "getopt_long_only shall return -1");

/* Test scenario 2 */
argv = (char **)argv2;
getopt_init();
state = getopt_state_get();
c = getopt_long_only(argc2, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc2, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 0, "verbose flag expected");
c = getopt_long_only(argc2, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc2, argv, accepted_opt, long_options, &option_index);
state = getopt_state_get();
zassert_equal('d', c, "unexpected option");
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]),
"unexpected optarg");
c = getopt_long_only(argc2, argv, accepted_opt,
long_options, &option_index);
zassert_equal(0, strcmp(state->optarg, argv[GETOPT_LONG_IDX_OPTARG]), "unexpected optarg");
c = getopt_long_only(argc2, argv, accepted_opt, long_options, &option_index);
zassert_equal(-1, c, "getopt_long_only shall return -1");

/* Test scenario 3 */
argv = (char **)argv3;
getopt_init();
c = getopt_long_only(argc3, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc3, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 0, "verbose flag expected");
c = getopt_long_only(argc3, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc3, argv, accepted_opt, long_options, &option_index);
zassert_equal('a', c, "unexpected option");
c = getopt_long_only(argc3, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc3, argv, accepted_opt, long_options, &option_index);
zassert_equal(-1, c, "getopt_long_only shall return -1");

/* Test scenario 4 */
argv = (char **)argv4;
getopt_init();
c = getopt_long_only(argc4, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc4, argv, accepted_opt, long_options, &option_index);
zassert_equal(verbose_flag, 0, "verbose flag expected");
c = getopt_long_only(argc4, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc4, argv, accepted_opt, long_options, &option_index);

/* Function was called with option '-l'. It is expected it will be
* evaluated to '--long' which has flag 'e'.
*/
zassert_equal('e', c, "unexpected option");
c = getopt_long_only(argc4, argv, accepted_opt,
long_options, &option_index);
c = getopt_long_only(argc4, argv, accepted_opt, long_options, &option_index);
}
9 changes: 9 additions & 0 deletions tests/posix/c_lib_ext/src/main.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Copyright (c) 2024 Marvin Ouma <pancakesdeath@protonmail.com>
*
* SPDX-License-Identifier: Apache-2.0
*/

#include <zephyr/ztest.h>

ZTEST_SUITE(posix_c_lib_ext, NULL, NULL, NULL, NULL, NULL);
Loading

0 comments on commit 232585b

Please sign in to comment.