Skip to content

Added skip flags #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2025
Merged

Added skip flags #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e8ef9d
add cli pasta
dreamer-coding May 20, 2025
b7d4a96
add skip command
dreamer-coding May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ The Pizza Test CLI provides an efficient way to run and manage tests directly fr
|----------------------|-----------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
| `--fail-fast` | Stop on the first failure. | Useful for quickly identifying and addressing critical issues. |
| `--only <test>` | Run only the specified test. | Focuses execution on a single test for debugging or validation purposes. |
| `--skip <test>` | Skip the specified test. | Allows excluding specific tests from execution. |
| `--repeat <count>` | Repeat the test a specified number of times. | Useful for stress testing or verifying consistency across multiple runs. |
| `--help` | Show help for the run command. | Provides detailed usage instructions for the `run` command. |
### Filter Command Options
Expand Down
62 changes: 36 additions & 26 deletions code/logic/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ static void _show_subhelp_run(void) {
pizza_io_printf("{blue}Run command options:{reset}\n");
pizza_io_printf("{cyan} --fail-fast Stop on the first failure{reset}\n");
pizza_io_printf("{cyan} --only <test> Run only the specified test{reset}\n");
pizza_io_printf("{cyan} --skip <test> Skip the specified test{reset}\n");
pizza_io_printf("{cyan} --repeat <count> Repeat the test a specified number of times{reset}\n");
pizza_io_printf("{cyan} --help Show help for run command{reset}\n");
exit(EXIT_SUCCESS);
Expand Down Expand Up @@ -201,6 +202,7 @@ static void _show_host(void) {

fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
fossil_pizza_pallet_t pallet = {0};
int is_command = 0; // Variable to track if a command is being processed

// Parse command-line arguments
for (int i = 1; i < argc; i++) {
Expand All @@ -213,32 +215,41 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
} else if (pizza_io_cstr_compare(argv[i], "--host") == 0) {
_show_host();
} else if (pizza_io_cstr_compare(argv[i], "run") == 0) {
is_command = 1;
pallet.run.fail_fast = 0;
pallet.run.only = null;
pallet.run.skip = null;
pallet.run.repeat = 1;

for (int j = i + 1; j < argc; j++) {
if (!is_command) break;
if (pizza_io_cstr_compare(argv[j], "--fail-fast") == 0) {
pallet.run.fail_fast = 1;
G_PIZZA_FAIL_FAST = 1;
} else if (pizza_io_cstr_compare(argv[j], "--only") == 0 && j + 1 < argc) {
pallet.run.only = argv[++j];
G_PIZZA_ONLY = pallet.run.only;
} else if (pizza_io_cstr_compare(argv[j], "--skip") == 0 && j + 1 < argc) {
pallet.run.skip = argv[++j];
G_PIZZA_SKIP = 1;
} else if (pizza_io_cstr_compare(argv[j], "--repeat") == 0 && j + 1 < argc) {
pallet.run.repeat = atoi(argv[++j]);
G_PIZZA_REPEAT = pallet.run.repeat;
} else if (pizza_io_cstr_compare(argv[j], "--threads") == 0 && j + 1 < argc) {
G_PIZZA_THREADS = atoi(argv[++j]);
} else if (pizza_io_cstr_compare(argv[j], "--help") == 0) {
_show_subhelp_run();
} else {
break;
is_command = 0;
}
}
} else if (pizza_io_cstr_compare(argv[i], "filter") == 0) {
is_command = 1;
pallet.filter.test_name = null;
pallet.filter.suite_name = null;
pallet.filter.tag = null;

for (int j = i + 1; j < argc; j++) {
if (!is_command) break;
if (pizza_io_cstr_compare(argv[j], "--test-name") == 0 && j + 1 < argc) {
pallet.filter.test_name = argv[++j];
} else if (pizza_io_cstr_compare(argv[j], "--suite-name") == 0 && j + 1 < argc) {
Expand Down Expand Up @@ -267,14 +278,16 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
}
exit(EXIT_SUCCESS);
} else {
break;
is_command = 0;
}
}
} else if (pizza_io_cstr_compare(argv[i], "sort") == 0) {
is_command = 1;
pallet.sort.by = null;
pallet.sort.order = null;

for (int j = i + 1; j < argc; j++) {
if (!is_command) break;
if (pizza_io_cstr_compare(argv[j], "--by") == 0 && j + 1 < argc) {
const char* criteria = argv[++j];
int is_valid_criteria = 0;
Expand All @@ -301,32 +314,34 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
}
exit(EXIT_SUCCESS);
} else {
break;
is_command = 0;
}
}
} else if (pizza_io_cstr_compare(argv[i], "shuffle") == 0) {
is_command = 1;
pallet.shuffle.seed = null;
pallet.shuffle.count = 0;
pallet.shuffle.by = null;

for (int j = i + 1; j < argc; j++) {
if (pizza_io_cstr_compare(argv[j], "--seed") == 0 && j + 1 < argc) {
pallet.shuffle.seed = argv[++j];
} else if (pizza_io_cstr_compare(argv[j], "--count") == 0 && j + 1 < argc) {
pallet.shuffle.count = atoi(argv[++j]);
} else if (pizza_io_cstr_compare(argv[j], "--by") == 0 && j + 1 < argc) {
pallet.shuffle.by = argv[++j];
} else if (pizza_io_cstr_compare(argv[j], "--help") == 0) {
_show_subhelp_shuffle();
} else if (pizza_io_cstr_compare(argv[j], "--options") == 0) {
pizza_io_printf("{blue}Valid criteria for shuffling:{reset}\n");
for (int k = 0; VALID_CRITERIA[k] != null; k++) {
pizza_io_printf("{cyan} %s{reset}\n", VALID_CRITERIA[k]);
if (!is_command) break;
if (pizza_io_cstr_compare(argv[j], "--seed") == 0 && j + 1 < argc) {
pallet.shuffle.seed = argv[++j];
} else if (pizza_io_cstr_compare(argv[j], "--count") == 0 && j + 1 < argc) {
pallet.shuffle.count = atoi(argv[++j]);
} else if (pizza_io_cstr_compare(argv[j], "--by") == 0 && j + 1 < argc) {
pallet.shuffle.by = argv[++j];
} else if (pizza_io_cstr_compare(argv[j], "--help") == 0) {
_show_subhelp_shuffle();
} else if (pizza_io_cstr_compare(argv[j], "--options") == 0) {
pizza_io_printf("{blue}Valid criteria for shuffling:{reset}\n");
for (int k = 0; VALID_CRITERIA[k] != null; k++) {
pizza_io_printf("{cyan} %s{reset}\n", VALID_CRITERIA[k]);
}
exit(EXIT_SUCCESS);
} else {
is_command = 0;
}
exit(EXIT_SUCCESS);
} else {
break;
}
}
} else if (strncmp(argv[i], "color=", 6) == 0) {
if (pizza_io_cstr_compare(argv[i] + 6, "enable") == 0) {
Expand Down Expand Up @@ -363,7 +378,6 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
if (i + 1 < argc && pizza_io_cstr_compare(argv[i + 1], "--help") == 0) {
_show_help();
}

} else if (strncmp(argv[i], "theme=", 6) == 0) {
const char* theme_str = argv[i] + 6;
if (pizza_io_cstr_compare(theme_str, "fossil") == 0) {
Expand All @@ -387,7 +401,6 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
} else if (pizza_io_cstr_compare(theme_str, "unity") == 0) {
pallet.theme = PIZZA_THEME_UNITY;
G_PIZZA_THEME = PIZZA_THEME_UNITY;

}
} else if (pizza_io_cstr_compare(argv[i], "theme") == 0) {
if (i + 1 < argc && pizza_io_cstr_compare(argv[i + 1], "--help") == 0) {
Expand All @@ -401,7 +414,7 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
} else if (pizza_io_cstr_compare(verbose_str, "ci") == 0) {
pallet.verbose = PIZZA_VERBOSE_CI;
G_PIZZA_VERBOSE = PIZZA_VERBOSE_CI;
} else if (pizza_io_cstr_compare(verbose_str, "doge") == 0) { // means verbose for Pizza Test
} else if (pizza_io_cstr_compare(verbose_str, "doge") == 0) {
pallet.verbose = PIZZA_VERBOSE_DOGE;
G_PIZZA_VERBOSE = PIZZA_VERBOSE_DOGE;
}
Expand All @@ -416,9 +429,6 @@ fossil_pizza_pallet_t fossil_pizza_pallet_create(int argc, char** argv) {
_show_help();
exit(EXIT_SUCCESS);
}
} else {
pizza_io_printf("{red}Error: Unknown command or option '%s'.{reset}\n", argv[i]);
exit(EXIT_FAILURE);
}
}

Expand Down
1 change: 1 addition & 0 deletions code/logic/fossil/pizza/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ typedef struct {
struct {
int fail_fast; // Flag for --fail-fast
const char* only; // Value for --only
const char* skip; // Value for --skip
int repeat; // Value for --repeat
} run; // Run command flags

Expand Down
68 changes: 32 additions & 36 deletions code/logic/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,54 +237,50 @@ static uint64_t seconds_to_nanoseconds(uint64_t seconds) {
void fossil_pizza_run_test(const fossil_pizza_engine_t* engine, fossil_pizza_case_t* test_case, fossil_pizza_suite_t* suite) {
if (!test_case || !suite) return;

if (test_case->result != FOSSIL_PIZZA_CASE_SKIPPED) {
// Check if the test case name matches the --only filter
if (engine->pallet.run.only && pizza_io_cstr_compare(engine->pallet.run.only, test_case->name) != 0) {
return;
}
// Check if the test case name matches the --only filter
if (engine->pallet.run.only && pizza_io_cstr_compare(engine->pallet.run.only, test_case->name) != 0) {
return; // Skip this test case if it doesn't match the --only filter
}

// Check if the test case name matches the --skip filter
if (engine->pallet.run.skip && pizza_io_cstr_compare(engine->pallet.run.skip, test_case->name) == 0) {
test_case->result = FOSSIL_PIZZA_CASE_SKIPPED;
return; // Skip this test case if it matches the --skip filter
}

for (int i = 0; i < (engine->pallet.run.repeat ? engine->pallet.run.repeat : 1); ++i) {
if (test_case->setup) test_case->setup();
for (int i = 0; i < (engine->pallet.run.repeat ? engine->pallet.run.repeat : 1); ++i) {
if (test_case->setup) test_case->setup();

uint64_t start_time = fossil_pizza_now_ns();
uint64_t start_time = fossil_pizza_now_ns();

if (test_case->run) {
if (setjmp(test_jump_buffer) == 0) {
test_case->run();
uint64_t elapsed_time = fossil_pizza_now_ns() - start_time;
if (test_case->run) {
if (setjmp(test_jump_buffer) == 0) {
test_case->run();
uint64_t elapsed_time = fossil_pizza_now_ns() - start_time;

if (elapsed_time > seconds_to_nanoseconds(G_PIZZA_TIMEOUT)) { // 1 minute in nanoseconds
test_case->result = FOSSIL_PIZZA_CASE_TIMEOUT;
} else {
test_case->result = FOSSIL_PIZZA_CASE_PASS;
}
if (elapsed_time > seconds_to_nanoseconds(G_PIZZA_TIMEOUT)) { // 1 minute in nanoseconds
test_case->result = FOSSIL_PIZZA_CASE_TIMEOUT;
} else {
test_case->result = FOSSIL_PIZZA_CASE_FAIL;
if (engine->pallet.run.fail_fast) {
fossil_pizza_test_output(test_case);
return; // Exit immediately if --fail-fast is enabled
}
test_case->result = FOSSIL_PIZZA_CASE_PASS;
}
} else {
test_case->result = FOSSIL_PIZZA_CASE_EMPTY;
test_case->result = FOSSIL_PIZZA_CASE_FAIL;
if (engine->pallet.run.fail_fast) {
fossil_pizza_test_output(test_case);
return; // Exit immediately if --fail-fast is enabled
}
}
test_case->elapsed_ns = fossil_pizza_now_ns() - start_time;

if (test_case->teardown) test_case->teardown();
} else {
test_case->result = FOSSIL_PIZZA_CASE_EMPTY;
}
test_case->elapsed_ns = fossil_pizza_now_ns() - start_time;

// Output test case result
fossil_pizza_test_output(test_case);
} else if (test_case->result == FOSSIL_PIZZA_CASE_SKIPPED) {
// Output skipped test case result
test_case->elapsed_ns = 0; // No time elapsed for skipped tests
fossil_pizza_test_output(test_case);
} else {
// Handle unexpected cases
test_case->result = FOSSIL_PIZZA_CASE_UNEXPECTED;
fossil_pizza_test_output(test_case);
if (test_case->teardown) test_case->teardown();
}

// Output test case result
fossil_pizza_test_output(test_case);

// Update scores based on result
fossil_pizza_update_score(test_case, suite);
_ASSERT_COUNT = 0; // Reset the assertion count for the next test case
Expand Down