Skip to content

Commit 8f36ea6

Browse files
committed
test(pipeline): rename the near/far locals in the record accessor test
Windows headers define near and far as empty macros, so the locals named near and far in the generated-accessor pipeline test did not compile on the Windows leg. Rename them to near_m and far_m; the node names stay. Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent 1d4bcc9 commit 8f36ea6

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

‎tests/test_pipeline.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18059,25 +18059,25 @@ static int jgen_check(cbm_store_t *s, const char *project) {
1805918059
int64_t acc_y = jgen_node(s, project, "y", "Method", "Point.java", &gen_y);
1806018060
int64_t own_z = jgen_node(s, project, "z", "Method", "Point.java", &gen_z);
1806118061
int64_t norm = jgen_node(s, project, "norm", "Method", "Point.java", &gen_norm);
18062-
int64_t near = jgen_node(s, project, "near", "Method", "Caller.java", NULL);
18063-
int64_t far = jgen_node(s, project, "far", "Method", "Caller.java", NULL);
18062+
int64_t near_m = jgen_node(s, project, "near", "Method", "Caller.java", NULL);
18063+
int64_t far_m = jgen_node(s, project, "far", "Method", "Caller.java", NULL);
1806418064
int64_t data = jgen_node(s, project, "data", "Method", "Caller.java", NULL);
1806518065
int64_t make = jgen_node(s, project, "make", "Method", "Caller.java", NULL);
1806618066
int64_t stat = jgen_node(s, project, "stat", "Method", "Caller.java", NULL);
1806718067
int64_t refs = jgen_node(s, project, "refs", "Method", "Caller.java", NULL);
1806818068
JGEN_EXPECT(acc_x > 0 && acc_y > 0 && own_z > 0 && norm > 0 && acc_nn > 0);
18069-
JGEN_EXPECT(near > 0 && far > 0 && data > 0 && make > 0 && stat > 0 && refs > 0);
18069+
JGEN_EXPECT(near_m > 0 && far_m > 0 && data > 0 && make > 0 && stat > 0 && refs > 0);
1807018070
/* The compiler's members are marked; the hand-written ones are not. */
1807118071
JGEN_EXPECT(gen_x);
1807218072
JGEN_EXPECT(gen_y);
1807318073
JGEN_EXPECT(gen_nn);
1807418074
JGEN_EXPECT(!gen_z);
1807518075
JGEN_EXPECT(!gen_norm);
1807618076
/* Bound by qualified name through the receiver's type ... */
18077-
JGEN_EXPECT(jgen_calls(s, near, acc_y, NULL) == 1);
18077+
JGEN_EXPECT(jgen_calls(s, near_m, acc_y, NULL) == 1);
1807818078
/* ... and never by a short-name guess. */
18079-
JGEN_EXPECT(jgen_calls(s, far, acc_y, NULL) == 0);
18080-
JGEN_EXPECT(jgen_calls(s, far, 0, "y") == 0);
18079+
JGEN_EXPECT(jgen_calls(s, far_m, acc_y, NULL) == 0);
18080+
JGEN_EXPECT(jgen_calls(s, far_m, 0, "y") == 0);
1808118081
/* Neither the accessor nor Spring's field `x`. */
1808218082
JGEN_EXPECT(jgen_calls(s, data, 0, "x") == 0);
1808318083
/* No import names a generated member, so nothing follows one onto it. */

0 commit comments

Comments
 (0)