From bba708403d68585ba532cdeea1947433511aa460 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 13 Oct 2021 22:25:34 +0300 Subject: Remove non-working check of M68K in gctest Because of a bug in the #if logical expression, particular test of GC_is_visible has been never excluded on NetBSD/m68k. This commit just simplifies the expression not changing the logic. * tests/test.c [!DBG_HDRS_ALL && (IA64 || POWERPC)] (run_one_test): Do not test M68K macro; move TEST_FAIL_COUNT(1) inside ifdef. --- tests/test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/test.c b/tests/test.c index 9224be51..b5b96d71 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1281,16 +1281,15 @@ void run_one_test(void) GC_printf("GC_PTR_STORE failed: %p != %p\n", (void *)(*z), (void *)x); FAIL; } - if (!TEST_FAIL_COUNT(1)) { -# if!(defined(POWERPC) || defined(IA64)) || defined(M68K) +# if !defined(IA64) && !defined(POWERPC) + if (!TEST_FAIL_COUNT(1)) { /* On POWERPCs function pointers point to a descriptor in the */ /* data segment, so there should have been no failures. */ - /* The same applies to IA64. Something similar seems to */ - /* be going on with NetBSD/M68K. */ + /* The same applies to IA64. */ GC_printf("GC_is_visible produced wrong failure indication\n"); FAIL; -# endif - } + } +# endif if (GC_is_valid_displacement(y) != y || GC_is_valid_displacement(x) != x || GC_is_valid_displacement(x + 3) != x + 3) { -- cgit v1.2.1