[clang] [InstallAPI][Tests] Update tests to be resilient to reversion iteration config (PR #89270)
https://github.com/cyndyishida created https://github.com/llvm/llvm-project/pull/89270 None >From efefd04b1545b62f3a22bc0ff53bfb0a2a512b1f Mon Sep 17 00:00:00 2001 From: Cyndy Ishida Date: Thu, 18 Apr 2024 10:24:35 -0700 Subject: [PATCH] [InstallAPI][Tests] Update tests to be resilient to reversion iteration config --- clang/test/InstallAPI/binary-attributes.test | 2 +- clang/test/InstallAPI/rpath.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/test/InstallAPI/binary-attributes.test b/clang/test/InstallAPI/binary-attributes.test index d97c7a14a98d78..b28e99f6445462 100644 --- a/clang/test/InstallAPI/binary-attributes.test +++ b/clang/test/InstallAPI/binary-attributes.test @@ -43,7 +43,7 @@ ; RUN: -current_version 1.2.3 -compatibility_version 1 \ ; RUN: -allowable_client Foo -allowable_client Bar \ ; RUN: -o tmp.tbd --verify-against=%t/Simple 2>&1 | FileCheck -check-prefix=ALLOWABLE %s -; ALLOWABLE: error: allowable client missing from binary file: 'Foo [ x86_64 ]' +; ALLOWABLE: error: allowable client missing from binary file: '{{Foo|Bar}} [ x86_64 ]' ; RUN: not clang-installapi -target x86_64-apple-macos10.12 \ ; RUN: -install_name /System/Library/Frameworks/Simple.framework/Versions/A/Simple \ diff --git a/clang/test/InstallAPI/rpath.test b/clang/test/InstallAPI/rpath.test index 083a15419abaab..ace9c47b6e686a 100644 --- a/clang/test/InstallAPI/rpath.test +++ b/clang/test/InstallAPI/rpath.test @@ -12,8 +12,8 @@ ; RUN: --verify-mode=Pedantic 2>&1 | FileCheck %s --check-prefix=MISSING ; RUN: llvm-readtapi --compare %t/RPath_warnings.tbd %t/expected_no_rpaths.tbd -; MISSING: warning: runpath search paths missing from installAPI option: '@loader_path/../../../SharedFrameworks/ [ x86_64 arm64 ]' -; MISSING: warning: runpath search paths missing from installAPI option: '@loader_path/../../PrivateFrameworks/ [ x86_64 arm64 ]' +; MISSING-DAG: warning: runpath search paths missing from installAPI option: '@loader_path/../../../SharedFrameworks/ [ x86_64 arm64 ]' +; MISSING-DAG: warning: runpath search paths missing from installAPI option: '@loader_path/../../PrivateFrameworks/ [ x86_64 arm64 ]' ; RUN: clang-installapi --filetype=tbd-v5 \ ; RUN: -target arm64-apple-macos13.0 -target x86_64-apple-macos13.0 \ ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [InstallAPI][Tests] Update tests to be resilient to reversion iteration config (PR #89270)
llvmbot wrote: @llvm/pr-subscribers-clang Author: Cyndy Ishida (cyndyishida) Changes --- Full diff: https://github.com/llvm/llvm-project/pull/89270.diff 2 Files Affected: - (modified) clang/test/InstallAPI/binary-attributes.test (+1-1) - (modified) clang/test/InstallAPI/rpath.test (+2-2) ``diff diff --git a/clang/test/InstallAPI/binary-attributes.test b/clang/test/InstallAPI/binary-attributes.test index d97c7a14a98d78..b28e99f6445462 100644 --- a/clang/test/InstallAPI/binary-attributes.test +++ b/clang/test/InstallAPI/binary-attributes.test @@ -43,7 +43,7 @@ ; RUN: -current_version 1.2.3 -compatibility_version 1 \ ; RUN: -allowable_client Foo -allowable_client Bar \ ; RUN: -o tmp.tbd --verify-against=%t/Simple 2>&1 | FileCheck -check-prefix=ALLOWABLE %s -; ALLOWABLE: error: allowable client missing from binary file: 'Foo [ x86_64 ]' +; ALLOWABLE: error: allowable client missing from binary file: '{{Foo|Bar}} [ x86_64 ]' ; RUN: not clang-installapi -target x86_64-apple-macos10.12 \ ; RUN: -install_name /System/Library/Frameworks/Simple.framework/Versions/A/Simple \ diff --git a/clang/test/InstallAPI/rpath.test b/clang/test/InstallAPI/rpath.test index 083a15419abaab..ace9c47b6e686a 100644 --- a/clang/test/InstallAPI/rpath.test +++ b/clang/test/InstallAPI/rpath.test @@ -12,8 +12,8 @@ ; RUN: --verify-mode=Pedantic 2>&1 | FileCheck %s --check-prefix=MISSING ; RUN: llvm-readtapi --compare %t/RPath_warnings.tbd %t/expected_no_rpaths.tbd -; MISSING: warning: runpath search paths missing from installAPI option: '@loader_path/../../../SharedFrameworks/ [ x86_64 arm64 ]' -; MISSING: warning: runpath search paths missing from installAPI option: '@loader_path/../../PrivateFrameworks/ [ x86_64 arm64 ]' +; MISSING-DAG: warning: runpath search paths missing from installAPI option: '@loader_path/../../../SharedFrameworks/ [ x86_64 arm64 ]' +; MISSING-DAG: warning: runpath search paths missing from installAPI option: '@loader_path/../../PrivateFrameworks/ [ x86_64 arm64 ]' ; RUN: clang-installapi --filetype=tbd-v5 \ ; RUN: -target arm64-apple-macos13.0 -target x86_64-apple-macos13.0 \ `` https://github.com/llvm/llvm-project/pull/89270 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [InstallAPI][Tests] Update tests to be resilient to reversion iteration config (PR #89270)
efriedma-quic wrote: How hard would it be to make the output here have a consistent order? I mean, emitting diagnostics in a consistent order isn't nearly as important as emitting consistent binaries, but it's still nice to have if we can get it easily. https://github.com/llvm/llvm-project/pull/89270 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [InstallAPI][Tests] Update tests to be resilient to reversion iteration config (PR #89270)
cyndyishida wrote: > How hard would it be to make the output here have a consistent order? I mean, > emitting diagnostics in a consistent order isn't nearly as important as > emitting consistent binaries, but it's still nice to have if we can get it > easily. I don't think it's too hard in general, but a little more effort to get it done in a performant fashion for the passing InstallAPI case. Something I'd want to profile before committing to. https://github.com/llvm/llvm-project/pull/89270 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [InstallAPI][Tests] Update tests to be resilient to reversion iteration config (PR #89270)
https://github.com/cyndyishida closed https://github.com/llvm/llvm-project/pull/89270 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits