From e08c435401bc335c687b693591feafd7dbca1455 Mon Sep 17 00:00:00 2001 From: Zixu Wang Date: Mon, 11 Apr 2022 10:52:36 -0700 Subject: [PATCH] [clang][ExtractAPI][NFC] Fix sed delimiter in test Fix path replacement in sed (properly this time) using lit regex_replacement. Differential Revision: https://reviews.llvm.org/D123526 Co-authored-by: Michele Scandale Co-authored-by: Zixu Wang <9819235+zixu-w@users.noreply.github.com> --- clang/test/ExtractAPI/enum.c | 4 ++-- clang/test/ExtractAPI/global_record.c | 4 ++-- clang/test/ExtractAPI/global_record_multifile.c | 4 ++-- clang/test/ExtractAPI/known_files_only.c | 4 ++-- clang/test/ExtractAPI/known_files_only_hmap.c | 8 ++++---- clang/test/ExtractAPI/language.c | 8 ++++---- clang/test/ExtractAPI/macro_undefined.c | 4 ++-- clang/test/ExtractAPI/macros.c | 4 ++-- clang/test/ExtractAPI/objc_category.m | 4 ++-- clang/test/ExtractAPI/objc_interface.m | 4 ++-- clang/test/ExtractAPI/objc_protocol.m | 4 ++-- clang/test/ExtractAPI/struct.c | 4 ++-- clang/test/ExtractAPI/typedef.c | 4 ++-- clang/test/ExtractAPI/typedef_anonymous_record.c | 4 ++-- clang/test/ExtractAPI/typedef_chain.c | 4 ++-- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/clang/test/ExtractAPI/enum.c b/clang/test/ExtractAPI/enum.c index 60f6905..49e39f7 100644 --- a/clang/test/ExtractAPI/enum.c +++ b/clang/test/ExtractAPI/enum.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api -target arm64-apple-macosx \ // RUN: %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/global_record.c b/clang/test/ExtractAPI/global_record.c index 1722c03..8516ac5 100644 --- a/clang/test/ExtractAPI/global_record.c +++ b/clang/test/ExtractAPI/global_record.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=GlobalRecord -target arm64-apple-macosx \ // RUN: %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/global_record_multifile.c b/clang/test/ExtractAPI/global_record_multifile.c index 4d65665..0eacb8a 100644 --- a/clang/test/ExtractAPI/global_record_multifile.c +++ b/clang/test/ExtractAPI/global_record_multifile.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=GlobalRecord -target arm64-apple-macosx \ // RUN: %t/input1.h %t/input2.h %t/input3.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/known_files_only.c b/clang/test/ExtractAPI/known_files_only.c index 6baba4e..ddb6e57 100644 --- a/clang/test/ExtractAPI/known_files_only.c +++ b/clang/test/ExtractAPI/known_files_only.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=GlobalRecord -target arm64-apple-macosx \ // RUN: %t/input1.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/known_files_only_hmap.c b/clang/test/ExtractAPI/known_files_only_hmap.c index d5d06e6..3b7609a 100644 --- a/clang/test/ExtractAPI/known_files_only_hmap.c +++ b/clang/test/ExtractAPI/known_files_only_hmap.c @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/known_files_only.hmap.json.in >> \ -// RUN: %t/known_files_only.hmap.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/known_files_only.hmap.json.in >> %t/known_files_only.hmap.json // RUN: %hmaptool write %t/known_files_only.hmap.json %t/known_files_only.hmap // RUN: %clang -extract-api --product-name=KnownFilesOnlyHmap -target arm64-apple-macosx \ // RUN: -I%t/known_files_only.hmap -I%t/subdir %t/subdir/subdir1/input.h \ diff --git a/clang/test/ExtractAPI/language.c b/clang/test/ExtractAPI/language.c index 7effe75..b9f69b2 100644 --- a/clang/test/ExtractAPI/language.c +++ b/clang/test/ExtractAPI/language.c @@ -1,9 +1,9 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/c.reference.output.json.in >> \ -// RUN: %t/c.reference.output.json -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/objc.reference.output.json.in >> \ -// RUN: %t/objc.reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/c.reference.output.json.in >> %t/c.reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/objc.reference.output.json.in >> %t/objc.reference.output.json // RUN: %clang -extract-api -x c-header -target arm64-apple-macosx \ // RUN: %t/c.h -o %t/c.output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/macro_undefined.c b/clang/test/ExtractAPI/macro_undefined.c index 9eee8eb..c7d3dd6 100644 --- a/clang/test/ExtractAPI/macro_undefined.c +++ b/clang/test/ExtractAPI/macro_undefined.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=Macros -target arm64-apple-macosx \ // RUN: -x objective-c-header %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/macros.c b/clang/test/ExtractAPI/macros.c index eb8e3f2..c8df9ec 100644 --- a/clang/test/ExtractAPI/macros.c +++ b/clang/test/ExtractAPI/macros.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=Macros -target arm64-apple-macosx \ // RUN: -x objective-c-header %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/objc_category.m b/clang/test/ExtractAPI/objc_category.m index 2a69740..946f01e 100644 --- a/clang/test/ExtractAPI/objc_category.m +++ b/clang/test/ExtractAPI/objc_category.m @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api -x objective-c-header -target arm64-apple-macosx \ // RUN: %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/objc_interface.m b/clang/test/ExtractAPI/objc_interface.m index 1ac2f81..bd1f23e 100644 --- a/clang/test/ExtractAPI/objc_interface.m +++ b/clang/test/ExtractAPI/objc_interface.m @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api -x objective-c-header -target arm64-apple-macosx \ // RUN: %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/objc_protocol.m b/clang/test/ExtractAPI/objc_protocol.m index 28cc0c3..0368509 100644 --- a/clang/test/ExtractAPI/objc_protocol.m +++ b/clang/test/ExtractAPI/objc_protocol.m @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api -x objective-c-header -target arm64-apple-macosx \ // RUN: %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/struct.c b/clang/test/ExtractAPI/struct.c index 38f55c1..51605576 100644 --- a/clang/test/ExtractAPI/struct.c +++ b/clang/test/ExtractAPI/struct.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api -target arm64-apple-macosx \ // RUN: %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/typedef.c b/clang/test/ExtractAPI/typedef.c index 4d1fd01..fb9b8ef3 100644 --- a/clang/test/ExtractAPI/typedef.c +++ b/clang/test/ExtractAPI/typedef.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=Typedef -target arm64-apple-macosx \ // RUN: -x objective-c-header %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/typedef_anonymous_record.c b/clang/test/ExtractAPI/typedef_anonymous_record.c index 5444239..e3e3476 100644 --- a/clang/test/ExtractAPI/typedef_anonymous_record.c +++ b/clang/test/ExtractAPI/typedef_anonymous_record.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=TypedefChain -target arm64-apple-macosx \ // RUN: -x objective-c-header %t/input.h -o %t/output.json | FileCheck -allow-empty %s diff --git a/clang/test/ExtractAPI/typedef_chain.c b/clang/test/ExtractAPI/typedef_chain.c index 42a78d1..3ba4765 100644 --- a/clang/test/ExtractAPI/typedef_chain.c +++ b/clang/test/ExtractAPI/typedef_chain.c @@ -1,7 +1,7 @@ // RUN: rm -rf %t // RUN: split-file %s %t -// RUN: sed -e "s@INPUT_DIR@%/t@g" %t/reference.output.json.in >> \ -// RUN: %t/reference.output.json +// RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \ +// RUN: %t/reference.output.json.in >> %t/reference.output.json // RUN: %clang -extract-api --product-name=TypedefChain -target arm64-apple-macosx \ // RUN: -x objective-c-header %t/input.h -o %t/output.json | FileCheck -allow-empty %s -- 2.7.4