From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3b9SAXggKChY2BDAy4zw2AA270.yA874xwx42w47EAGDy0IwD0.AD2@flex--gprocida.bounces.google.com> Received: from mail-vk1-xa49.google.com (mail-vk1-xa49.google.com [IPv6:2607:f8b0:4864:20::a49]) by sourceware.org (Postfix) with ESMTPS id D73B3385E001 for ; Sun, 29 Mar 2020 17:01:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D73B3385E001 Received: by mail-vk1-xa49.google.com with SMTP id j68so4715228vkj.12 for ; Sun, 29 Mar 2020 10:01:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=D58rNiZvsWL1GvkOtTn80pJcvKIlE5u/OzI/7BYUxfU=; b=l+TWIC7yu6s2Fmn8/wl+QNgfxyzbGm44pNpRFm5KeZQuzQu4q3nFhUbgIOkpEsNEQK bbeFUOCFou2zlcGrNeXfxEl2bQgpdz3RujJpJfAv+GPfceyZBIDyt8op8ila586lRhLS 1rWq8fNQnlli/Q8nZol/Al9CQNXa4TsZ1Q+DRX8/f0C3rsPKt4lRb8B/+kM+SA773mOf x70gJoY9vKbn7HlZEWG1j1BStZup1fZEWiOZ2Gn4Cc0sIAfrsJtVywuHPPj0E/P7Dqc8 +d+W4CU3t/vYXA9if2ALkIvVy+ZrsHXY005eIlSjFS4JB33E/7b8AZBuGFw8SxFN9q5Q KUXA== X-Gm-Message-State: AGi0PuaDOJ12Ww16ykZQvzdeQXVt77wU/7sILhCqTJu7frHB1oTxntcF E/SBRqRCYmMsVapFkr8vvr18LIMtHfQOgXv7+2hQirOZ63OkO56aImYJSlqUJ7oNRpvNUTXcdGQ SVza+tRZYiZqD3w91WzlJ1ALgQBCTIbvWhvLchtx0Hu/wF05upCcLEyQ18gVYAlu5Y8h3svQ= X-Google-Smtp-Source: APiQypIprSCLhqyyj6qpJHJM8xH3EmVORWQvCPRzp9pjJtv7aIPImR52eNl0bo2k1LvsJ66Mjwx+Fwkky8qawA== X-Received: by 2002:a05:6122:305:: with SMTP id c5mr4942698vko.40.1585501295163; Sun, 29 Mar 2020 10:01:35 -0700 (PDT) Date: Sun, 29 Mar 2020 18:01:20 +0100 In-Reply-To: <20200329170121.188147-1-gprocida@google.com> Message-Id: <20200329170121.188147-2-gprocida@google.com> Mime-Version: 1.0 References: <20200329170121.188147-1-gprocida@google.com> X-Mailer: git-send-email 2.26.0.rc2.310.g2932bb562d-goog Subject: [PATCH 2/3] test-diff-suppr.cc: Add missing tests. From: Giuliano Procida To: libabigail@sourceware.org Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com, maennich@google.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-32.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libabigail mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 17:01:37 -0000 Commit 79383f937ca5cd8b3b0cd9e8a5c28871172e7bf1 added many tests but didn't actually execute three of them. Commit fe9fa7a05f88cf73b3f53c188a7682467901d12d added many tests but didn't actually execute one of them. This patch corrects these issues. * tests/test-diff-suppr.cc: Add stanzas for test6-fn-suppr-report-4, test16-suppr-removed-fn-report-5 and test22-suppr-removed-var-sym-report-5 and test23-alias-filter-report-4 tests. * tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt: Number parameters from 1 and update expected output to current formatting. * tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt: Update expected output to current formatting. * tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt: Update expected output to current formatting. Signed-off-by: Giuliano Procida --- .../test16-suppr-removed-fn-report-5.txt | 4 +- .../test22-suppr-removed-var-sym-report-5.txt | 1 - .../test6-fn-suppr-report-4.txt | 13 +++--- tests/test-diff-suppr.cc | 40 +++++++++++++++++++ 4 files changed, 47 insertions(+), 11 deletions(-) diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt index e12412dc..b28fbd16 100644 --- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt +++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt @@ -10,9 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable [C] 'function void bar(S*)' has some indirect sub-type changes: parameter 1 of type 'S*' has sub-type changes: in pointed to type 'struct S': - type size changed from 32 to 64 bits + type size changed from 32 to 64 (in bits) 1 data member insertion: 'unsigned int S::bar', at offset 32 (in bits) - - diff --git a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt index 174f1b93..5549648d 100644 --- a/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt +++ b/tests/data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt @@ -3,7 +3,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable Function symbols changes summary: 0 Removed, 0 Added function symbol not referenced by debug info Variable symbols changes summary: 0 Removed (2 filtered out), 1 Added variable symbols not referenced by debug info - 1 Added variable symbol not referenced by debug info: [A] global_var3 diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt index 5633bed5..094b4903 100644 --- a/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt +++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt @@ -4,21 +4,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable 2 functions with some indirect sub-type change: [C] 'function void bar(S1*)' has some indirect sub-type changes: - parameter 0 of type 'S1*' has sub-type changes: + parameter 1 of type 'S1*' has sub-type changes: in pointed to type 'struct S1': - size changed from 32 to 64 bits + type size changed from 32 to 64 (in bits) 1 base class insertion: struct base 1 data member change: - 'int S1::m0' offset changed from 0 to 32 + 'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits) [C] 'function int bar(S&)' has some indirect sub-type changes: - parameter 0 of type 'S&' has sub-type changes: + parameter 1 of type 'S&' has sub-type changes: in referenced type 'struct S': - size changed from 32 to 64 bits + type size changed from 32 to 64 (in bits) 1 base class insertion: struct base 1 data member change: - 'int S::m0' offset changed from 0 to 32 - + 'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits) diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc index 6b6a748c..abc1b3d7 100644 --- a/tests/test-diff-suppr.cc +++ b/tests/test-diff-suppr.cc @@ -348,6 +348,16 @@ InOutSpec in_out_specs[] = "data/test-diff-suppr/test6-fn-suppr-report-3.txt", "output/test-diff-suppr/test6-fn-suppr-report-3.txt", }, + { + "data/test-diff-suppr/libtest6-fn-suppr-v0.so", + "data/test-diff-suppr/libtest6-fn-suppr-v1.so", + "", + "", + "data/test-diff-suppr/test6-fn-suppr-3.suppr", + "--no-default-suppression --no-show-locs --no-redundant", + "data/test-diff-suppr/test6-fn-suppr-report-4.txt", + "output/test-diff-suppr/test6-fn-suppr-report-4.txt", + }, { "data/test-diff-suppr/libtest7-var-suppr-v0.so", "data/test-diff-suppr/libtest7-var-suppr-v1.so", @@ -738,6 +748,16 @@ InOutSpec in_out_specs[] = "data/test-diff-suppr/test16-suppr-removed-fn-report-4.txt", "output/test-diff-suppr/test16-suppr-removed-fn-report-4.txt" }, + { + "data/test-diff-suppr/test16-suppr-removed-fn-v0.o", + "data/test-diff-suppr/test16-suppr-removed-fn-v1.o", + "", + "", + "data/test-diff-suppr/test16-suppr-removed-fn-4.suppr", + "--no-default-suppression --no-show-locs --no-redundant", + "data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt", + "output/test-diff-suppr/test16-suppr-removed-fn-report-5.txt" + }, { "data/test-diff-suppr/test17-suppr-added-var-v0.o", "data/test-diff-suppr/test17-suppr-added-var-v1.o", @@ -1088,6 +1108,16 @@ InOutSpec in_out_specs[] = "data/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt", "output/test-diff-suppr/test22-suppr-removed-var-sym-report-4.txt" }, + { + "data/test-diff-suppr/test22-suppr-removed-var-sym-v0.o", + "data/test-diff-suppr/test22-suppr-removed-var-sym-v1.o", + "", + "", + "data/test-diff-suppr/test22-suppr-removed-var-sym-4.suppr", + "--no-default-suppression --no-show-locs --no-redundant", + "data/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt", + "output/test-diff-suppr/test22-suppr-removed-var-sym-report-5.txt" + }, { "data/test-diff-suppr/libtest23-alias-filter-v0.so", "data/test-diff-suppr/libtest23-alias-filter-v1.so ", @@ -1128,6 +1158,16 @@ InOutSpec in_out_specs[] = "data/test-diff-suppr/test23-alias-filter-report-3.txt", "output/test-diff-suppr/test23-alias-filter-report-3.txt" }, + { + "data/test-diff-suppr/libtest23-alias-filter-v0.so", + "data/test-diff-suppr/libtest23-alias-filter-v1.so ", + "", + "", + "data/test-diff-suppr/test23-alias-filter-3.suppr", + "--no-default-suppression --no-show-locs --no-redundant", + "data/test-diff-suppr/test23-alias-filter-report-4.txt", + "output/test-diff-suppr/test23-alias-filter-report-4.txt" + }, { "data/test-diff-suppr/libtest23-alias-filter-v0.so", "data/test-diff-suppr/libtest23-alias-filter-v1.so ", -- 2.26.0.rc2.310.g2932bb562d-goog