update test and runner

fossillogic · Jun 11, 2024 · 1be3d23 · 1be3d23
1 parent eba81ad
commit 1be3d23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 59 deletions.
diff --git a/code/source/unittest/unittest.c b/code/source/unittest/unittest.c
@@ -277,7 +277,7 @@ void _fossil_test_scoreboard_feature_rules(fossil_test_t *test_case) {
  if (_TEST_ENV.rule.skipped == true && strcmp(test_case->marks, "skip") == 0) {
  _TEST_ENV.stats.expected_skipped_count++;
  _TEST_ENV.rule.skipped = false;
- } else if (!_xassert_info.has_assert) {
+ } else if (!_xassert_info.has_assert && strcmp(test_case->marks, "tofu") == 0) {
  _TEST_ENV.stats.expected_empty_count++;
  } else if (_TEST_ENV.rule.should_timeout == true) {
  _TEST_ENV.stats.expected_timeout_count++;
@@ -418,9 +418,8 @@ void fossil_test_apply_mark(fossil_test_t *test, const char *mark) {
  if (strcmp(mark, "skip") == 0) {
  test->marks = "skip";
  _TEST_ENV.rule.skipped = true;
- } else if (strcmp(mark, "timeout") == 0) {
- test->marks = "timeout";
- _TEST_ENV.rule.timeout = true;
+ } else if (strcmp(mark, "tofu") == 0) {
+ test->marks = "tofu";
  } else if (strcmp(mark, "error") == 0) {
  test->marks = "error";
  _TEST_ENV.rule.should_pass = false;

diff --git a/test/xtest_tdd.c b/test/xtest_tdd.c
@@ -95,7 +95,7 @@ FOSSIL_TEST(xassert_run_of_int64) {
 FOSSIL_TEST_GROUP(tdd_test_group) {
  ADD_TEST(xassert_run_of_int);
  ADD_TEST(xassert_run_of_int8);
- // ADD_TEST(xassert_run_of_int16);
- // ADD_TEST(xassert_run_of_int32);
- // ADD_TEST(xassert_run_of_int64);
+ ADD_TEST(xassert_run_of_int16);
+ ADD_TEST(xassert_run_of_int32);
+ ADD_TEST(xassert_run_of_int64);
 } // end of group
diff --git a/test/xunit_runner.c b/test/xunit_runner.c