From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 761723858CDA for ; Wed, 26 Apr 2023 12:28:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 761723858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682512087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=J1DlcT4ErlhV4nAC3MS4Tn9wOjZFEgotSIrbWbXlJbQ=; b=JVu4zvI2/4i138PIbaZaxlvgCH45zR5MDIKl2lPRun/d4Kx8mLSuOD1Aga3VhZXJFxHboK Z6cmnSYzFSvBCkdJNqCSa3FoVJDgxdr6JIeM+nJsOhu/MiHgGmdnVBQKBkywIpUVB/xRCl Bh1Cq8lfYB2yOooQtMLidjLIvGE08c4= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-MpennJwiOrW0oARZJkXtZg-1; Wed, 26 Apr 2023 08:28:06 -0400 X-MC-Unique: MpennJwiOrW0oARZJkXtZg-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-5ef47299acdso40815376d6.3 for ; Wed, 26 Apr 2023 05:28:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682512086; x=1685104086; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J1DlcT4ErlhV4nAC3MS4Tn9wOjZFEgotSIrbWbXlJbQ=; b=PsmmSkbrN21zzQUERD3oUQSy4j9kCW0PncNq55uIsUyP642M6deVcqUuBnD0WloNTS NrIRmX83p86Y4D92AOsAJa7eqDBsar8M0mNPmBUeCv/HQZqZ7NuMZJN69sNx14K0z6eU /9TtW/7l3yTpONsieM9K9TcbpQE5vQIlEY1+c0Mu7piS7S2pxRp2HoKHiKP+sSScisE8 roVJIJO+hoRh/2GVRzQ3nlJHXHXQfSBICSRZjvhQn+roBDFOOJLufhCGhZkc2aAg65k4 sopBKBq80bhYD1jCmqo7Fo+nEHjIdWDfY/W9Q9YnT8js7YH7eK502bL8xl14mtdYFuTo 99Ng== X-Gm-Message-State: AC+VfDyD0B6a1YJqi7beTpw6ZKP7lphPXBeVEgNoG/Br5XQRQDWmNFrb XZ2w7iMjroC9hoHSLRL9BdZHpLlWy/BkVy0mAzEncBorURYUGqrsowGfgzjCfaNVpoLgkGA5peB tH2RaJqg195HZ7wE9ELRfoSIoeC89/mSSEnMJalY2uKgR4kvS5WtnZ1twqm62nrLoC9FEp9kIME 3N X-Received: by 2002:a05:622a:28f:b0:3f0:daab:f24f with SMTP id z15-20020a05622a028f00b003f0daabf24fmr5018664qtw.68.1682512086010; Wed, 26 Apr 2023 05:28:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6V6k5fHoMG9deYP/ruCGbBrXXqE8CX8dWAY7utf5WZm3URoI7DoWQ5kjLPPEpxDCtth3zBTQ== X-Received: by 2002:a05:622a:28f:b0:3f0:daab:f24f with SMTP id z15-20020a05622a028f00b003f0daabf24fmr5018631qtw.68.1682512085679; Wed, 26 Apr 2023 05:28:05 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id h10-20020a05620a400a00b0074e17de13d2sm4796768qko.3.2023.04.26.05.28.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 05:28:05 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id B5228B5078; Wed, 26 Apr 2023 14:28:03 +0200 (CEST) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH, applied] test-abidiff-exit: Fix the command line passed to abidiff Organization: Red Hat / France X-Operating-System: CentOS Stream release 9 X-URL: http://www.redhat.com Date: Wed, 26 Apr 2023 14:28:03 +0200 Message-ID: <87fs8m7rqk.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hello, I noticed that the command line passed to abidiff in the test-abidiff-exit.cc is getting bigger and bigger as the test runs. This is because in the main loop that calls abidiff on each test, we forget to reset the "headers directories" part of the command line passed to abidiff. Fixed thus. * tests/test-abidiff-exit.cc (main): Reset the headers directories passed to abidiff at each iteration. Signed-off-by: Dodji Seketeli --- tests/test-abidiff-exit.cc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc index dafd0036..f7f1b0f9 100644 --- a/tests/test-abidiff-exit.cc +++ b/tests/test-abidiff-exit.cc @@ -934,10 +934,19 @@ main() in_elfv1_path = source_dir_prefix + s->in_elfv1_path; in_elfv0_debug_dir = source_dir_prefix + s->in_elfv0_debug_dir; in_elfv1_debug_dir = source_dir_prefix + s->in_elfv1_debug_dir; - split_string(s->in_elfv0_headers_dirs, ",", in_elfv0_headers_dirs); - split_string(s->in_elfv1_headers_dirs, ",", in_elfv1_headers_dirs); - do_prefix_strings(in_elfv0_headers_dirs, source_dir_prefix); - do_prefix_strings(in_elfv1_headers_dirs, source_dir_prefix); + in_elfv0_headers_dirs.clear(); + in_elfv1_headers_dirs.clear(); + if (s->in_elfv0_headers_dirs && strcmp(s->in_elfv0_headers_dirs, "")) + { + split_string(s->in_elfv0_headers_dirs, ",", in_elfv0_headers_dirs); + do_prefix_strings(in_elfv0_headers_dirs, source_dir_prefix); + } + + if (s->in_elfv1_headers_dirs && strcmp(s->in_elfv1_headers_dirs, "")) + { + split_string(s->in_elfv1_headers_dirs, ",", in_elfv1_headers_dirs); + do_prefix_strings(in_elfv1_headers_dirs, source_dir_prefix); + } if (s->in_suppr_path && strcmp(s->in_suppr_path, "")) in_suppression_path = source_dir_prefix + s->in_suppr_path; -- 2.39.1 -- Dodji