From 92b821034a364a884e4a81f7b46eb5f71b3484ad Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Mon, 20 Jul 2015 16:01:27 +0200 Subject: [PATCH] Clean up the output of abicompat weak mode Remove ugly vertical spaces from the output of abicompat in weak mode and adjust regression tests accordingly. * tools/abicompat.cc (perform_compat_check_in_weak_mode): Remove disgracious vertical spaces in the wording. * tests/data/test-abicompat/test5-fn-changed-report-0.txt: Adjust. * tests/data/test-abicompat/test6-var-changed-report-0.txt: Adjust. Signed-off-by: Dodji Seketeli --- .../test-abicompat/test5-fn-changed-report-0.txt | 7 ++----- .../test-abicompat/test6-var-changed-report-0.txt | 7 ++----- tools/abicompat.cc | 12 ++++++------ 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/data/test-abicompat/test5-fn-changed-report-0.txt b/tests/data/test-abicompat/test5-fn-changed-report-0.txt index e774f2bc..3a24f98f 100644 --- a/tests/data/test-abicompat/test5-fn-changed-report-0.txt +++ b/tests/data/test-abicompat/test5-fn-changed-report-0.txt @@ -1,8 +1,5 @@ -functions defined in library - 'libtest5-fn-changed-libapp-v1.so' -have sub-types that are different from what application - 'test5-fn-changed-app' -expects: +functions defined in library 'libtest5-fn-changed-libapp-v1.so' +have sub-types that are different from what application 'test5-fn-changed-app' expects: function void bar(S0*): parameter 1 of type 'S0*' has sub-type changes: diff --git a/tests/data/test-abicompat/test6-var-changed-report-0.txt b/tests/data/test-abicompat/test6-var-changed-report-0.txt index df475098..5c9eae73 100644 --- a/tests/data/test-abicompat/test6-var-changed-report-0.txt +++ b/tests/data/test-abicompat/test6-var-changed-report-0.txt @@ -1,8 +1,5 @@ -variables defined in library - 'libtest6-var-changed-libapp-v1.so' -have sub-types that are different from what application - 'test6-var-changed-app' -expects: +variables defined in library 'libtest6-var-changed-libapp-v1.so' +have sub-types that are different from what application 'test6-var-changed-app' expects: S0* bar: in pointed to type 'struct S0': diff --git a/tools/abicompat.cc b/tools/abicompat.cc index 430a5b8f..b406a337 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -506,10 +506,10 @@ perform_compat_check_in_weak_mode(options& opts, if (!fn_changes.empty()) { - cout << "functions defined in library\n " + cout << "functions defined in library " << "'" << lib1_path << "'\n" - << "have sub-types that are different from what application\n " - << "'" << app_path << "'\n" + << "have sub-types that are different from what application " + << "'" << app_path << "' " << "expects:\n\n"; for (vector::const_iterator i = fn_changes.begin(); i != fn_changes.end(); @@ -543,10 +543,10 @@ perform_compat_check_in_weak_mode(options& opts, } if (!var_changes.empty()) { - cout << "variables defined in library\n " + cout << "variables defined in library " << "'" << lib1_path << "'\n" - << "have sub-types that are different from what application\n " - << "'" << app_path << "'\n" + << "have sub-types that are different from what application " + << "'" << app_path << "' " << "expects:\n\n"; for (vector::const_iterator i = var_changes.begin(); i != var_changes.end(); -- 2.43.5