From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3XniUYggKCrshqspdjebhpphmf.dpnmjcbcjhbjmtpvsdfxbsf.psh@flex--gprocida.bounces.google.com> Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id 6CF81383583E for ; Mon, 30 May 2022 07:55:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6CF81383583E Received: by mail-yb1-xb49.google.com with SMTP id 16-20020a5b0110000000b0064ff08b8235so9124721ybx.5 for ; Mon, 30 May 2022 00:55:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=R65J+dELac4CxCGdPzyaUv+mPOS5HCjhiWHwuzPSz7Q=; b=1cl3D2OYR1apsNVQkKWo8+g79c8ONPnLeZcP8EZWXEub8g/vMvFHdQ/y0vJ6XTB/Hg nQxzAn5N1ig8GMcTZZqf6W4zNgnUYdJ61jgFp0ytvUh8I2FUUJnoFApRjb+016Axfr9Z 7PZy3jWGvDDk4rmJymyl2i/1DHHpp62vBdjF9oQizNIgnGSS4RJLkfFzCNQGNzLD1w/G P7NegHTvIwqhIgoXUQjnFut8F9GKGMTOOG7OExPKd5F3U5ddYuKIHjooWwNQTS5Bxhqe 0zabE/2nq8Wjgm94Kgap22T4kayfwSbc/Garzfx+SzaEh8uVlhIHuFrK9TRxGZLLcAt7 3Cnw== X-Gm-Message-State: AOAM5320/sLeJrt6nFbRP7UChfYe60u5bFJKWved0uYAB0KlaGorKSDc PmDVzYaQS3Gg+twvuzlYKJTvOyE3MGjpEyZZe08rmz2rSx5kIy97VTgwitLjgGAfcWDgVeE8Qmk 4HT9lzfsf/hBt8fOmAteGg7Qdqryfp5KbOGGlJ4YJ0g7W/EICmPLZkUZLV0ho8noR2oyOvv8= X-Google-Smtp-Source: ABdhPJzZ3F/Qy/e+UvxrBsny3KdD6BbBXQ0dN89OoSDclM5azmlWAVAFu2IPp+13pjDN2LYbcq4KS4pY6lR1nQ== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:209:3c05:9f3d:51c:b2ea]) (user=gprocida job=sendgmr) by 2002:a81:1358:0:b0:30c:2e28:4050 with SMTP id 85-20020a811358000000b0030c2e284050mr7236975ywt.206.1653897310600; Mon, 30 May 2022 00:55:10 -0700 (PDT) Date: Mon, 30 May 2022 08:55:01 +0100 Message-Id: <20220530075501.725826-1-gprocida@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog Subject: [PATCH] test-annotate.cc: ignore whitespace during diff From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, maennich@google.com, Bogdan Graur Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-22.1 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2022 07:55:13 -0000 The LLVM C++ demangler is being updated to remove the extra space delimiter added between consecutive template closings. This change ensures tests pass with both old and new versions. * tests/test-annotate.cc (main): Pass diff -w option. Suggested-by: Bogdan Graur Signed-off-by: Giuliano Procida --- tests/test-annotate.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc index 174de483..750f5e88 100644 --- a/tests/test-annotate.cc +++ b/tests/test-annotate.cc @@ -173,7 +173,7 @@ main() if (abidw_ok) { string diff_cmd = - "diff -u " + ref_report_path + " " + out_report_path; + "diff -w -u " + ref_report_path + " " + out_report_path; if (system(diff_cmd.c_str())) is_ok &=false; } -- 2.36.1.124.g0e6072fb45-goog