Skip to content

Commit 78a2ec3

Browse files
committed
test(parallel): rename the near graph buffer for MinGW
The DeusData#2184 parallel test named a local `near`. Windows headers define `near` (and `far`) as empty legacy pointer qualifiers, so under MinGW `cbm_gbuf_t *near = ...` loses its name and test_parallel.c fails to compile (test-windows CLANG64 2/2: "expected identifier or '('"). Rename it to `gb_near`. A MinGW syntax-only check of tests/test_parallel.c reported 4 errors before this change and none after. Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent 26cbccd commit 78a2ec3

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

‎tests/test_parallel.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ TEST(parallel_post_extract_projection_spills_before_resolve) {
720720

721721
cbm_mem_set_charged_for_tests(latch);
722722
int cached_near = -1;
723-
cbm_gbuf_t *near =
723+
cbm_gbuf_t *gb_near =
724724
run_parallel_with_extract_opts_and_mutator("par-test", g_par_tmpdir, files, file_count, 2,
725725
NULL, count_cached_results, &cached_near, false);
726726
int64_t parked_near = g_harness_parked;
@@ -736,7 +736,7 @@ TEST(parallel_post_extract_projection_spills_before_resolve) {
736736
g_harness_spill = false;
737737
cbm_mem_set_budget_for_tests(saved_budget);
738738
cbm_discover_free(files, file_count);
739-
ASSERT(near != NULL);
739+
ASSERT(gb_near != NULL);
740740
ASSERT(roomy != NULL);
741741

742742
/* A: every result went to disk before registry build. */
@@ -746,15 +746,15 @@ TEST(parallel_post_extract_projection_spills_before_resolve) {
746746
ASSERT_EQ((int)parked_roomy, -1);
747747
ASSERT_GT(cached_roomy, 0);
748748

749-
graph_fp_t fp_near = graph_fingerprint(near);
749+
graph_fp_t fp_near = graph_fingerprint(gb_near);
750750
graph_fp_t fp_roomy = graph_fingerprint(roomy);
751751
graph_fp_t fp_mem = graph_fingerprint(g_par_gbuf);
752752
ASSERT_GT(fp_mem.count, 0);
753753
ASSERT_EQ(fp_near.count, fp_mem.count);
754754
ASSERT_EQ(fp_roomy.count, fp_mem.count);
755755
ASSERT_TRUE(fp_near.sum == fp_mem.sum && fp_near.xr == fp_mem.xr);
756756
ASSERT_TRUE(fp_roomy.sum == fp_mem.sum && fp_roomy.xr == fp_mem.xr);
757-
cbm_gbuf_free(near);
757+
cbm_gbuf_free(gb_near);
758758
cbm_gbuf_free(roomy);
759759
PASS();
760760
}

0 commit comments

Comments
 (0)