From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by sourceware.org (Postfix) with ESMTPS id 6E9D43858D3C for ; Sun, 16 Jan 2022 14:06:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6E9D43858D3C Received: by mail-pg1-x536.google.com with SMTP id h23so7339602pgk.11 for ; Sun, 16 Jan 2022 06:06:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=kpEteD+fw8xx6k/iWlMGMDP8SdD62GbvmI43bLXPYVo=; b=h46owVbTqJIgKO0I6XeMe9xZhKYjxk+0KiRrnSwEFmiEK11f/7sNdOuPqu1OB9vP2J /egFfCvyNWGca7lKKx7+2f9B6vlRtzGUnPouQuhR/4jYlKqdzArlKvVejDFRuYf0tdzv gew91OBvcxpxYmJRrdlX1lY7tUwTX4B9JAVa4afFsCpxNQanVKVG9+ZpMW/xlwmbgxS8 0xGrGQZq8MsKOfdU7qq8OR972VvXZVkHasTPSbT3OTt0XPytT3jLRKxq7Dt1rSJhuVFI 5vK+UPABJV9TZLNWryMZMF70+bzfb0DDlINhc6ZlPJE9M42vkyKzDwujhppKv3M3EjoT JCHg== X-Gm-Message-State: AOAM5339jhy5WcJe5fFVX6PC3sMrm+/5WWVdEREegjs/IMx3e6c2mQKW sU+DmUYHAJke+Q+mNuYTlmtxLLPj4TGTWxU1z7BcuHBxUqE= X-Google-Smtp-Source: ABdhPJxnEdpZS8uD0sREGhafRWuL0Ctu3DTu9voVuzUeYRZlRxwn33UX6bDiqReKrIYjb5Y81G/VJ5Vww0628bCCcfU= X-Received: by 2002:a05:6a00:234e:b0:4ae:2e0d:cc68 with SMTP id j14-20020a056a00234e00b004ae2e0dcc68mr17060445pfj.60.1642341988510; Sun, 16 Jan 2022 06:06:28 -0800 (PST) MIME-Version: 1.0 References: <636c6da259e612258791a6e816bfc7bbfed97e3a.1641228666.git.fweimer@redhat.com> In-Reply-To: <636c6da259e612258791a6e816bfc7bbfed97e3a.1641228666.git.fweimer@redhat.com> From: "H.J. Lu" Date: Sun, 16 Jan 2022 06:05:52 -0800 Message-ID: Subject: Re: [PATCH 3/3] elf/tst-dl_find_object: Disable subtests for non-contiguous maps (bug 28732) To: Florian Weimer Cc: GNU C Library Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3027.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2022 14:06:30 -0000 On Mon, Jan 3, 2022 at 9:13 AM Florian Weimer via Libc-alpha wrote: > > --- > elf/tst-dl_find_object.c | 29 +++++++++++++++++------------ > 1 file changed, 17 insertions(+), 12 deletions(-) > > diff --git a/elf/tst-dl_find_object.c b/elf/tst-dl_find_object.c > index 21cdc0f848..2ad1924088 100644 > --- a/elf/tst-dl_find_object.c > +++ b/elf/tst-dl_find_object.c > @@ -71,19 +71,24 @@ check (void *address, > __FILE__, line, address, > actual.dlfo_flags, expected->dlfo_flags); > } > - if (actual.dlfo_flags != expected->dlfo_flags) > + if (expected->dlfo_link_map->l_contiguous) > { > - support_record_failure (); > - printf ("%s:%d: error: %p: map start is %p, expected %p\n", > - __FILE__, line, > - address, actual.dlfo_map_start, expected->dlfo_map_start); > - } > - if (actual.dlfo_map_end != expected->dlfo_map_end) > - { > - support_record_failure (); > - printf ("%s:%d: error: %p: map end is %p, expected %p\n", > - __FILE__, line, > - address, actual.dlfo_map_end, expected->dlfo_map_end); > + /* If the mappings are not contiguous, the actual and execpted > + mappings may differ, so this subtest will not work. */ > + if (actual.dlfo_flags != expected->dlfo_flags) > + { > + support_record_failure (); > + printf ("%s:%d: error: %p: map start is %p, expected %p\n", > + __FILE__, line, > + address, actual.dlfo_map_start, expected->dlfo_map_start); > + } > + if (actual.dlfo_map_end != expected->dlfo_map_end) > + { > + support_record_failure (); > + printf ("%s:%d: error: %p: map end is %p, expected %p\n", > + __FILE__, line, > + address, actual.dlfo_map_end, expected->dlfo_map_end); > + } > } > if (actual.dlfo_link_map != expected->dlfo_link_map) > { > -- > 2.33.1 > LGTM. Reviewed-by: H.J. Lu Thanks. -- H.J.