[llvm-branch-commits] [llvm] 84851a2 - Revert "[SystemZ][z/OS] Fix No such file or directory expression error matching in lit tests - continued"
Author: Abhina Sreeskantharajan Date: 2021-01-25T08:29:38-05:00 New Revision: 84851a274e2beaa3cdafd6a70e6d1128cabf8b21 URL: https://github.com/llvm/llvm-project/commit/84851a274e2beaa3cdafd6a70e6d1128cabf8b21 DIFF: https://github.com/llvm/llvm-project/commit/84851a274e2beaa3cdafd6a70e6d1128cabf8b21.diff LOG: Revert "[SystemZ][z/OS] Fix No such file or directory expression error matching in lit tests - continued" This reverts commit 520b5ecf856152f35ee38207eec39f5674dd2bd4. Added: Modified: clang/test/Driver/clang-offload-bundler.c clang/test/Frontend/output-failures.c llvm/test/Object/archive-extract-dir.test llvm/test/Object/archive-extract.test llvm/test/Object/directory.ll llvm/test/tools/llvm-ar/error-opening-directory.test llvm/test/tools/llvm-ar/move.test llvm/test/tools/llvm-ar/print.test llvm/test/tools/llvm-ar/quick-append.test llvm/test/tools/llvm-libtool-darwin/invalid-input-output-args.test llvm/test/tools/llvm-lipo/create-arch.test llvm/test/tools/llvm-lipo/replace-invalid-input.test llvm/test/tools/llvm-lto/error.ll llvm/test/tools/llvm-objcopy/wasm/dump-section.test llvm/test/tools/llvm-symbolizer/pdb/missing_pdb.test Removed: diff --git a/clang/test/Driver/clang-offload-bundler.c b/clang/test/Driver/clang-offload-bundler.c index f7428d7f02f4..3e1fab25d754 100644 --- a/clang/test/Driver/clang-offload-bundler.c +++ b/clang/test/Driver/clang-offload-bundler.c @@ -72,7 +72,7 @@ // RUN: not clang-offload-bundler -type=i -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -inputs=%t.i,%t.tgt1,%t.tgt2.notexist -outputs=%t.bundle.i 2>&1 | FileCheck %s -DFILE=%t.tgt2.notexist --check-prefix CK-ERR5 // RUN: not clang-offload-bundler -type=i -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.i,%t.tgt1,%t.tgt2 -inputs=%t.bundle.i.notexist -unbundle 2>&1 | FileCheck %s -DFILE=%t.bundle.i.notexist --check-prefix CK-ERR5 -// CK-ERR5: error: '[[FILE]]': {{.*}}{{N|n}}o such file or directory +// CK-ERR5: error: '[[FILE]]': {{N|n}}o such file or directory // RUN: not clang-offload-bundler -type=invalid -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -inputs=%t.i,%t.tgt1,%t.tgt2 -outputs=%t.bundle.i 2>&1 | FileCheck %s -DTYPE=invalid --check-prefix CK-ERR6 // CK-ERR6: error: '[[TYPE]]': invalid file type specified diff --git a/clang/test/Frontend/output-failures.c b/clang/test/Frontend/output-failures.c index 26d25fdbef36..0e9ea63f8067 100644 --- a/clang/test/Frontend/output-failures.c +++ b/clang/test/Frontend/output-failures.c @@ -1,4 +1,4 @@ // RUN: not %clang_cc1 -emit-llvm -o %t.doesnotexist/somename %s 2> %t // RUN: FileCheck -check-prefix=OUTPUTFAIL -input-file=%t %s -// OUTPUTFAIL: error: unable to open output file '{{.*}}doesnotexist{{.}}somename': '{{.*}}{{[nN]}}o such file or directory{{.*}}' +// OUTPUTFAIL: error: unable to open output file '{{.*}}doesnotexist{{.}}somename': '{{[nN]}}o such file or directory' diff --git a/llvm/test/Object/archive-extract-dir.test b/llvm/test/Object/archive-extract-dir.test index d6a721c090b3..5182a2f91411 100644 --- a/llvm/test/Object/archive-extract-dir.test +++ b/llvm/test/Object/archive-extract-dir.test @@ -8,4 +8,4 @@ RUN: rm foo RUN: mkdir foo RUN: not llvm-ar x test.a foo 2>&1 | FileCheck %s -CHECK: foo: {{.*}}{{[Ii]}}s a directory{{.*}} +CHECK: foo: {{[Ii]}}s a directory diff --git a/llvm/test/Object/archive-extract.test b/llvm/test/Object/archive-extract.test index 589e8b8fe856..11ca12e3353b 100644 --- a/llvm/test/Object/archive-extract.test +++ b/llvm/test/Object/archive-extract.test @@ -58,4 +58,4 @@ RUN: llvm-ar p %p/Inputs/thin.a evenlen | FileCheck %s --check-prefix=EVENLEN EVENLEN: evenlen RUN: not llvm-ar p %p/Inputs/thin-path.a t/test2.o 2>&1 | FileCheck %s --check-prefix=MISSING -MISSING: error: {{.*}}{{N|n}}o such file or directory +MISSING: error: {{N|n}}o such file or directory diff --git a/llvm/test/Object/directory.ll b/llvm/test/Object/directory.ll index d9e340a587b1..3e9ac2ce202e 100644 --- a/llvm/test/Object/directory.ll +++ b/llvm/test/Object/directory.ll @@ -1,6 +1,6 @@ ;RUN: rm -rf %t && mkdir -p %t ;RUN: not llvm-ar r %t/test.a . 2>&1 | FileCheck %s -;CHECK: .: {{.*}}{{I|i}}s a directory{{.*}} +;CHECK: .: {{I|i}}s a directory ;RUN: rm -f %t/test.a ;RUN: touch %t/a-very-long-file-name diff --git a/llvm/test/tools/llvm-ar/error-opening-directory.test b/llvm/test/tools/llvm-ar/error-opening-directory.test index 5a6491bd29c8..c3068871230f 100644 --- a/llvm/test/tools/llvm-ar/error-opening-directory.test +++ b/llvm/test/tools/llvm-ar/error-opening-directory.test @@ -9,4 +9,4 @@ # RUN: not llvm-ar p %t/tmpDir 2>&1 | \ # RUN:FileCheck %s --check-prefix=IS-DIR -DARCHIVE=%t/tmpDir
[llvm-branch-commits] [lld] 978444d - Revert "[SystemZ][z/OS] Fix No such file or directory expression error"
Author: Abhina Sreeskantharajan Date: 2021-01-25T08:29:38-05:00 New Revision: 978444d531ddc2b3bd29ad469e8421293b4cc2e5 URL: https://github.com/llvm/llvm-project/commit/978444d531ddc2b3bd29ad469e8421293b4cc2e5 DIFF: https://github.com/llvm/llvm-project/commit/978444d531ddc2b3bd29ad469e8421293b4cc2e5.diff LOG: Revert "[SystemZ][z/OS] Fix No such file or directory expression error" This reverts commit 06f8a49693957bc27b83e0ab5f429ff874941a07. Added: Modified: clang/test/CodeGen/basic-block-sections.c clang/test/CodeGen/ubsan-blacklist-vfs.c clang/test/Frontend/stats-file.c lld/test/COFF/driver.test lld/test/COFF/manifestinput-error.test lld/test/COFF/nodefaultlib.test lld/test/COFF/pdb-type-server-invalid-signature.yaml lld/test/ELF/archive-thin-missing-member.s lld/test/ELF/basic.s lld/test/ELF/symbol-ordering-file.s llvm/test/DebugInfo/symbolize-missing-file.test llvm/test/tools/dsymutil/X86/papertrail-warnings.test llvm/test/tools/llvm-ar/missing-thin-archive-member.test llvm/test/tools/llvm-ar/replace.test llvm/test/tools/llvm-ar/response.test llvm/test/tools/llvm-cxxdump/trivial.test llvm/test/tools/llvm-libtool-darwin/filelist.test llvm/test/tools/llvm-lto2/X86/stats-file-option.ll llvm/test/tools/llvm-mc/basic.test llvm/test/tools/llvm-mca/invalid_input_file_name.test llvm/test/tools/llvm-ml/basic.test llvm/test/tools/llvm-objcopy/COFF/add-section.test llvm/test/tools/llvm-objcopy/ELF/add-section.test llvm/test/tools/llvm-objcopy/ELF/error-format.test llvm/test/tools/llvm-objcopy/MachO/add-section-error.test llvm/test/tools/llvm-objcopy/redefine-symbols.test llvm/test/tools/llvm-profdata/weight-instr.test llvm/test/tools/llvm-profdata/weight-sample.test llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test llvm/test/tools/llvm-readobj/basic.test llvm/test/tools/llvm-readobj/thin-archive.test llvm/test/tools/llvm-size/no-input.test llvm/test/tools/llvm-xray/X86/no-such-file.txt llvm/test/tools/obj2yaml/invalid_input_file.test llvm/test/tools/yaml2obj/output-file.yaml Removed: diff --git a/clang/test/CodeGen/basic-block-sections.c b/clang/test/CodeGen/basic-block-sections.c index 91bcb6222848..70cdeeebb0d3 100644 --- a/clang/test/CodeGen/basic-block-sections.c +++ b/clang/test/CodeGen/basic-block-sections.c @@ -41,4 +41,4 @@ int another(int a) { // // UNIQUE: .section .text.world.world.__part.1, // UNIQUE: .section .text.another.another.__part.1, -// ERROR: error: unable to load basic block sections function list: '{{.*}}{{[Nn]}}o such file or directory' +// ERROR: error: unable to load basic block sections function list: '{{[Nn]}}o such file or directory' diff --git a/clang/test/CodeGen/ubsan-blacklist-vfs.c b/clang/test/CodeGen/ubsan-blacklist-vfs.c index a8509eb2f6f9..0647cbf7a57b 100644 --- a/clang/test/CodeGen/ubsan-blacklist-vfs.c +++ b/clang/test/CodeGen/ubsan-blacklist-vfs.c @@ -8,10 +8,10 @@ // RUN: %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%/T/only-virtual-file.blacklist -emit-llvm %s -o - | FileCheck %s --check-prefix=FUNC // RUN: not %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%/T/invalid-virtual-file.blacklist -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=INVALID-MAPPED-FILE -// INVALID-MAPPED-FILE: invalid-virtual-file.blacklist': {{.*}}{{[Nn]}}o such file or directory +// INVALID-MAPPED-FILE: invalid-virtual-file.blacklist': {{[Nn]}}o such file or directory // RUN: not %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%t-nonexistent.blacklist -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=INVALID -// INVALID: nonexistent.blacklist': {{.*}}{{[Nn]}}o such file or directory +// INVALID: nonexistent.blacklist': {{[Nn]}}o such file or directory unsigned i; diff --git a/clang/test/Frontend/stats-file.c b/clang/test/Frontend/stats-file.c index 0d0a97b0d1d6..53b264534c57 100644 --- a/clang/test/Frontend/stats-file.c +++ b/clang/test/Frontend/stats-file.c @@ -5,4 +5,4 @@ // CHECK: } // RUN: %clang_cc1 -emit-llvm -o %t -stats-file=%t.doesnotexist/bla %s 2>&1 | FileCheck -check-prefix=OUTPUTFAIL %s -// OUTPUTFAIL: warning: unable to open statistics output file '{{.*}}doesnotexist{{.}}bla': '{{.*}}{{[Nn]}}o such file or directory{{.*}}' +// OUTPUTFAIL: warning: unable to open statistics output file '{{.*}}doesnotexist{{.}}bla': '{{[Nn]}}o such file or directory' diff --git a/lld/test/COFF/driver.test b/lld/test/COFF/driver.test index 951a4d3319f1..d756dc9ed4aa 100644 --- a/lld/test/COFF/driver.test +++ b/lld/test/COFF/driver.test @@ -1,6 +1,6 @@ # RUN: not lld-link nosuchfile.obj >& %t.log # RUN: FileCheck -check-prefix=MISSING %s < %
[llvm-branch-commits] [clang] 689aaba - [SystemZ][z/OS] Fix No such file or directory expression error matching in lit tests
Author: Abhina Sreeskantharajan Date: 2021-01-18T07:14:37-05:00 New Revision: 689aaba7acf5778bfe96bfd7bc4f1f3ceed20dc8 URL: https://github.com/llvm/llvm-project/commit/689aaba7acf5778bfe96bfd7bc4f1f3ceed20dc8 DIFF: https://github.com/llvm/llvm-project/commit/689aaba7acf5778bfe96bfd7bc4f1f3ceed20dc8.diff LOG: [SystemZ][z/OS] Fix No such file or directory expression error matching in lit tests On z/OS, the following error message is not matched correctly in lit tests. This patch updates the CHECK expression to match successfully. ``` EDC5129I No such file or directory. ``` Reviewed By: muiez Differential Revision: https://reviews.llvm.org/D94239 Added: Modified: clang/test/CodeGen/basic-block-sections.c clang/test/CodeGen/ubsan-blacklist-vfs.c clang/test/Frontend/stats-file.c lld/test/COFF/driver.test lld/test/COFF/manifestinput-error.test lld/test/COFF/nodefaultlib.test lld/test/COFF/pdb-type-server-invalid-signature.yaml lld/test/ELF/archive-thin-missing-member.s lld/test/ELF/basic.s lld/test/ELF/symbol-ordering-file.s llvm/test/DebugInfo/symbolize-missing-file.test llvm/test/tools/dsymutil/X86/papertrail-warnings.test llvm/test/tools/llvm-ar/missing-thin-archive-member.test llvm/test/tools/llvm-ar/replace.test llvm/test/tools/llvm-ar/response.test llvm/test/tools/llvm-cxxdump/trivial.test llvm/test/tools/llvm-lto2/X86/stats-file-option.ll llvm/test/tools/llvm-mc/basic.test llvm/test/tools/llvm-mca/invalid_input_file_name.test llvm/test/tools/llvm-ml/basic.test llvm/test/tools/llvm-objcopy/COFF/add-section.test llvm/test/tools/llvm-objcopy/ELF/add-section.test llvm/test/tools/llvm-objcopy/ELF/error-format.test llvm/test/tools/llvm-objcopy/MachO/add-section-error.test llvm/test/tools/llvm-objcopy/redefine-symbols.test llvm/test/tools/llvm-profdata/weight-instr.test llvm/test/tools/llvm-profdata/weight-sample.test llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test llvm/test/tools/llvm-readobj/basic.test llvm/test/tools/llvm-readobj/thin-archive.test llvm/test/tools/llvm-size/no-input.test llvm/test/tools/llvm-xray/X86/no-such-file.txt llvm/test/tools/obj2yaml/invalid_input_file.test llvm/test/tools/yaml2obj/output-file.yaml Removed: diff --git a/clang/test/CodeGen/basic-block-sections.c b/clang/test/CodeGen/basic-block-sections.c index 70cdeeebb0d3..91bcb6222848 100644 --- a/clang/test/CodeGen/basic-block-sections.c +++ b/clang/test/CodeGen/basic-block-sections.c @@ -41,4 +41,4 @@ int another(int a) { // // UNIQUE: .section .text.world.world.__part.1, // UNIQUE: .section .text.another.another.__part.1, -// ERROR: error: unable to load basic block sections function list: '{{[Nn]}}o such file or directory' +// ERROR: error: unable to load basic block sections function list: '{{.*}}{{[Nn]}}o such file or directory' diff --git a/clang/test/CodeGen/ubsan-blacklist-vfs.c b/clang/test/CodeGen/ubsan-blacklist-vfs.c index 0647cbf7a57b..a8509eb2f6f9 100644 --- a/clang/test/CodeGen/ubsan-blacklist-vfs.c +++ b/clang/test/CodeGen/ubsan-blacklist-vfs.c @@ -8,10 +8,10 @@ // RUN: %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%/T/only-virtual-file.blacklist -emit-llvm %s -o - | FileCheck %s --check-prefix=FUNC // RUN: not %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%/T/invalid-virtual-file.blacklist -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=INVALID-MAPPED-FILE -// INVALID-MAPPED-FILE: invalid-virtual-file.blacklist': {{[Nn]}}o such file or directory +// INVALID-MAPPED-FILE: invalid-virtual-file.blacklist': {{.*}}{{[Nn]}}o such file or directory // RUN: not %clang_cc1 -fsanitize=unsigned-integer-overflow -ivfsoverlay %t-vfsoverlay.yaml -fsanitize-blacklist=%t-nonexistent.blacklist -emit-llvm %s -o - 2>&1 | FileCheck %s --check-prefix=INVALID -// INVALID: nonexistent.blacklist': {{[Nn]}}o such file or directory +// INVALID: nonexistent.blacklist': {{.*}}{{[Nn]}}o such file or directory unsigned i; diff --git a/clang/test/Frontend/stats-file.c b/clang/test/Frontend/stats-file.c index 53b264534c57..007bb7f00b6c 100644 --- a/clang/test/Frontend/stats-file.c +++ b/clang/test/Frontend/stats-file.c @@ -5,4 +5,4 @@ // CHECK: } // RUN: %clang_cc1 -emit-llvm -o %t -stats-file=%t.doesnotexist/bla %s 2>&1 | FileCheck -check-prefix=OUTPUTFAIL %s -// OUTPUTFAIL: warning: unable to open statistics output file '{{.*}}doesnotexist{{.}}bla': '{{[Nn]}}o such file or directory' +// OUTPUTFAIL: warning: unable to open statistics output file '{{.*}}doesnotexist{{.}}bla': '{{.*}}{{[Nn]}}o such file or directory' diff --git a/lld/test/COFF/driver.test b/lld/test/COFF/driver.test index d756dc9ed4aa..951a4d3319f1 100644 --- a/lld/test/COFF/
[llvm-branch-commits] [clang] 2c4f6be - [SystemZ][z/OS] Fix No such file or directory expression error
Author: Abhina Sreeskantharajan Date: 2021-01-19T07:25:24-05:00 New Revision: 2c4f6be86c14c28243915ab9eb3a2ff1902fee99 URL: https://github.com/llvm/llvm-project/commit/2c4f6be86c14c28243915ab9eb3a2ff1902fee99 DIFF: https://github.com/llvm/llvm-project/commit/2c4f6be86c14c28243915ab9eb3a2ff1902fee99.diff LOG: [SystemZ][z/OS] Fix No such file or directory expression error On z/OS, the following error message is not matched correctly in lit tests. This patch updates the CHECK expression to match the end period successfully. ``` EDC5129I No such file or directory. ``` Differential Revision: https://reviews.llvm.org/D94239 Added: Modified: clang/test/Frontend/stats-file.c Removed: diff --git a/clang/test/Frontend/stats-file.c b/clang/test/Frontend/stats-file.c index 007bb7f00b6c..0d0a97b0d1d6 100644 --- a/clang/test/Frontend/stats-file.c +++ b/clang/test/Frontend/stats-file.c @@ -5,4 +5,4 @@ // CHECK: } // RUN: %clang_cc1 -emit-llvm -o %t -stats-file=%t.doesnotexist/bla %s 2>&1 | FileCheck -check-prefix=OUTPUTFAIL %s -// OUTPUTFAIL: warning: unable to open statistics output file '{{.*}}doesnotexist{{.}}bla': '{{.*}}{{[Nn]}}o such file or directory' +// OUTPUTFAIL: warning: unable to open statistics output file '{{.*}}doesnotexist{{.}}bla': '{{.*}}{{[Nn]}}o such file or directory{{.*}}' ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] 88e7c34 - [SystemZ][z/OS] Fix Permission denied pattern matching
Author: Abhina Sreeskantharajan Date: 2021-01-19T13:05:52-05:00 New Revision: 88e7c3498c3a8827c3706e39609b22dea9045432 URL: https://github.com/llvm/llvm-project/commit/88e7c3498c3a8827c3706e39609b22dea9045432 DIFF: https://github.com/llvm/llvm-project/commit/88e7c3498c3a8827c3706e39609b22dea9045432.diff LOG: [SystemZ][z/OS] Fix Permission denied pattern matching On z/OS, the error message "EDC5111I Permission denied." is not matched correctly in lit tests. This patch updates the check expression to match successfully. Differential Revision: https://reviews.llvm.org/D94432 Added: Modified: llvm/test/tools/llvm-ar/error-opening-permission.test Removed: diff --git a/llvm/test/tools/llvm-ar/error-opening-permission.test b/llvm/test/tools/llvm-ar/error-opening-permission.test index 00f80c0a1848..d8d0cbfd3556 100644 --- a/llvm/test/tools/llvm-ar/error-opening-permission.test +++ b/llvm/test/tools/llvm-ar/error-opening-permission.test @@ -11,4 +11,4 @@ # RUN: not llvm-ar p %t/permission.b 2>&1 | \ # RUN: FileCheck %s --check-prefix=NO-PERMISSION -DARCHIVE=%t/permission.b -# NO-PERMISSION: error: unable to open '[[ARCHIVE]]': {{[pP]}}ermission denied +# NO-PERMISSION: error: unable to open '[[ARCHIVE]]': {{.*}}{{[pP]}}ermission denied ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] 06f8a49 - [SystemZ][z/OS] Fix No such file or directory expression error
Author: Abhina Sreeskantharajan Date: 2021-01-22T11:41:40-05:00 New Revision: 06f8a49693957bc27b83e0ab5f429ff874941a07 URL: https://github.com/llvm/llvm-project/commit/06f8a49693957bc27b83e0ab5f429ff874941a07 DIFF: https://github.com/llvm/llvm-project/commit/06f8a49693957bc27b83e0ab5f429ff874941a07.diff LOG: [SystemZ][z/OS] Fix No such file or directory expression error On z/OS, the following error message is not matched correctly in lit tests. This patch updates the CHECK expression to match the end period successfully. ``` EDC5129I No such file or directory. ``` Differential Revision: https://reviews.llvm.org/D94239 Added: Modified: llvm/test/tools/llvm-libtool-darwin/filelist.test Removed: diff --git a/llvm/test/tools/llvm-libtool-darwin/filelist.test b/llvm/test/tools/llvm-libtool-darwin/filelist.test index bb606f0585fa..a8d8dac95a49 100644 --- a/llvm/test/tools/llvm-libtool-darwin/filelist.test +++ b/llvm/test/tools/llvm-libtool-darwin/filelist.test @@ -65,13 +65,13 @@ # RUN: not llvm-libtool-darwin -static -o %t.lib -filelist %t.invalid-list.txt 2>&1 | \ # RUN: FileCheck %s --check-prefix=FILE-ERROR -DFILE=no-such-file -# FILE-ERROR: error: '[[FILE]]': {{[nN]}}o such file or directory +# FILE-ERROR: error: '[[FILE]]': {{.*}}{{[nN]}}o such file or directory ## Check that an error is thrown when the directory exists but does not contain the requested file: # RUN: not llvm-libtool-darwin -static -o %t.lib -filelist %t.invalid-list.txt,%t/dirname 2>&1 | \ # RUN: FileCheck %s --check-prefix=DIR-ERROR -DDIR=%t/dirname -DFILE=no-such-file -# DIR-ERROR: error: '[[DIR]]{{[/\\]}}[[FILE]]': {{[nN]}}o such file or directory +# DIR-ERROR: error: '[[DIR]]{{[/\\]}}[[FILE]]': {{.*}}{{[nN]}}o such file or directory ## Check that an error is thrown when a file is in the cwd but dirname is specified: # RUN: yaml2obj %S/Inputs/input2.yaml -o %basename_t.tmp-input2.o ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] 520b5ec - [SystemZ][z/OS] Fix No such file or directory expression error matching in lit tests - continued
Author: Abhina Sreeskantharajan Date: 2021-01-22T13:54:25-05:00 New Revision: 520b5ecf856152f35ee38207eec39f5674dd2bd4 URL: https://github.com/llvm/llvm-project/commit/520b5ecf856152f35ee38207eec39f5674dd2bd4 DIFF: https://github.com/llvm/llvm-project/commit/520b5ecf856152f35ee38207eec39f5674dd2bd4.diff LOG: [SystemZ][z/OS] Fix No such file or directory expression error matching in lit tests - continued This is a continuation of https://reviews.llvm.org/D94239. I missed some other spellings of the same error. Reviewed By: muiez Differential Revision: https://reviews.llvm.org/D95246 Added: Modified: clang/test/Driver/clang-offload-bundler.c clang/test/Frontend/output-failures.c llvm/test/Object/archive-extract-dir.test llvm/test/Object/archive-extract.test llvm/test/Object/directory.ll llvm/test/tools/llvm-ar/error-opening-directory.test llvm/test/tools/llvm-ar/move.test llvm/test/tools/llvm-ar/print.test llvm/test/tools/llvm-ar/quick-append.test llvm/test/tools/llvm-libtool-darwin/invalid-input-output-args.test llvm/test/tools/llvm-lipo/create-arch.test llvm/test/tools/llvm-lipo/replace-invalid-input.test llvm/test/tools/llvm-lto/error.ll llvm/test/tools/llvm-objcopy/wasm/dump-section.test llvm/test/tools/llvm-symbolizer/pdb/missing_pdb.test Removed: diff --git a/clang/test/Driver/clang-offload-bundler.c b/clang/test/Driver/clang-offload-bundler.c index 3e1fab25d7544..f7428d7f02f4e 100644 --- a/clang/test/Driver/clang-offload-bundler.c +++ b/clang/test/Driver/clang-offload-bundler.c @@ -72,7 +72,7 @@ // RUN: not clang-offload-bundler -type=i -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -inputs=%t.i,%t.tgt1,%t.tgt2.notexist -outputs=%t.bundle.i 2>&1 | FileCheck %s -DFILE=%t.tgt2.notexist --check-prefix CK-ERR5 // RUN: not clang-offload-bundler -type=i -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -outputs=%t.i,%t.tgt1,%t.tgt2 -inputs=%t.bundle.i.notexist -unbundle 2>&1 | FileCheck %s -DFILE=%t.bundle.i.notexist --check-prefix CK-ERR5 -// CK-ERR5: error: '[[FILE]]': {{N|n}}o such file or directory +// CK-ERR5: error: '[[FILE]]': {{.*}}{{N|n}}o such file or directory // RUN: not clang-offload-bundler -type=invalid -targets=host-%itanium_abi_triple,openmp-powerpc64le-ibm-linux-gnu,openmp-x86_64-pc-linux-gnu -inputs=%t.i,%t.tgt1,%t.tgt2 -outputs=%t.bundle.i 2>&1 | FileCheck %s -DTYPE=invalid --check-prefix CK-ERR6 // CK-ERR6: error: '[[TYPE]]': invalid file type specified diff --git a/clang/test/Frontend/output-failures.c b/clang/test/Frontend/output-failures.c index 0e9ea63f8067b..26d25fdbef36c 100644 --- a/clang/test/Frontend/output-failures.c +++ b/clang/test/Frontend/output-failures.c @@ -1,4 +1,4 @@ // RUN: not %clang_cc1 -emit-llvm -o %t.doesnotexist/somename %s 2> %t // RUN: FileCheck -check-prefix=OUTPUTFAIL -input-file=%t %s -// OUTPUTFAIL: error: unable to open output file '{{.*}}doesnotexist{{.}}somename': '{{[nN]}}o such file or directory' +// OUTPUTFAIL: error: unable to open output file '{{.*}}doesnotexist{{.}}somename': '{{.*}}{{[nN]}}o such file or directory{{.*}}' diff --git a/llvm/test/Object/archive-extract-dir.test b/llvm/test/Object/archive-extract-dir.test index 5182a2f914110..d6a721c090b36 100644 --- a/llvm/test/Object/archive-extract-dir.test +++ b/llvm/test/Object/archive-extract-dir.test @@ -8,4 +8,4 @@ RUN: rm foo RUN: mkdir foo RUN: not llvm-ar x test.a foo 2>&1 | FileCheck %s -CHECK: foo: {{[Ii]}}s a directory +CHECK: foo: {{.*}}{{[Ii]}}s a directory{{.*}} diff --git a/llvm/test/Object/archive-extract.test b/llvm/test/Object/archive-extract.test index 11ca12e3353b1..589e8b8fe8561 100644 --- a/llvm/test/Object/archive-extract.test +++ b/llvm/test/Object/archive-extract.test @@ -58,4 +58,4 @@ RUN: llvm-ar p %p/Inputs/thin.a evenlen | FileCheck %s --check-prefix=EVENLEN EVENLEN: evenlen RUN: not llvm-ar p %p/Inputs/thin-path.a t/test2.o 2>&1 | FileCheck %s --check-prefix=MISSING -MISSING: error: {{N|n}}o such file or directory +MISSING: error: {{.*}}{{N|n}}o such file or directory diff --git a/llvm/test/Object/directory.ll b/llvm/test/Object/directory.ll index 3e9ac2ce202e8..d9e340a587b10 100644 --- a/llvm/test/Object/directory.ll +++ b/llvm/test/Object/directory.ll @@ -1,6 +1,6 @@ ;RUN: rm -rf %t && mkdir -p %t ;RUN: not llvm-ar r %t/test.a . 2>&1 | FileCheck %s -;CHECK: .: {{I|i}}s a directory +;CHECK: .: {{.*}}{{I|i}}s a directory{{.*}} ;RUN: rm -f %t/test.a ;RUN: touch %t/a-very-long-file-name diff --git a/llvm/test/tools/llvm-ar/error-opening-directory.test b/llvm/test/tools/llvm-ar/error-opening-directory.test index c3068871230fc..5a6491bd29c86 100644 --- a/llvm/test/tools/llvm-ar/error-opening-directory.test +++ b/llvm/test/tools/llvm-ar/error-opening-directory.t
[llvm-branch-commits] [llvm] 1027a22 - [SystemZ][z/OS] Fix Permission denied pattern matching
Author: Abhina Sreeskantharajan Date: 2021-01-11T14:31:27-05:00 New Revision: 1027a22ccd72bb127253cf7d27f528712fa21fa0 URL: https://github.com/llvm/llvm-project/commit/1027a22ccd72bb127253cf7d27f528712fa21fa0 DIFF: https://github.com/llvm/llvm-project/commit/1027a22ccd72bb127253cf7d27f528712fa21fa0.diff LOG: [SystemZ][z/OS] Fix Permission denied pattern matching On z/OS, the error message "EDC5111I Permission denied." is not matched correctly in lit tests. This patch updates the check expression to match successfully. Reviewed By: fanbo-meng Differential Revision: https://reviews.llvm.org/D94432 Added: Modified: llvm/test/tools/llvm-elfabi/fail-file-write.test Removed: diff --git a/llvm/test/tools/llvm-elfabi/fail-file-write.test b/llvm/test/tools/llvm-elfabi/fail-file-write.test index 3590409234fb..c3c479e73887 100644 --- a/llvm/test/tools/llvm-elfabi/fail-file-write.test +++ b/llvm/test/tools/llvm-elfabi/fail-file-write.test @@ -15,4 +15,4 @@ Arch: AArch64 Symbols: {} ... -# ERR: Permission denied when trying to open `{{.*}}.TestDir/Output.TestFile` for writing +# ERR: {{.*}}Permission denied{{.*}} when trying to open `{{.*}}.TestDir/Output.TestFile` for writing ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] 8ad998a - [tools] Mark output of tools as text if it is really text
Author: Abhina Sreeskantharajan Date: 2021-01-11T15:14:03-05:00 New Revision: 8ad998a6115a8cd59a18ebdd5ec65329e42050e7 URL: https://github.com/llvm/llvm-project/commit/8ad998a6115a8cd59a18ebdd5ec65329e42050e7 DIFF: https://github.com/llvm/llvm-project/commit/8ad998a6115a8cd59a18ebdd5ec65329e42050e7.diff LOG: [tools] Mark output of tools as text if it is really text This is a continuation of https://reviews.llvm.org/D67696. The following tools also need to set the OF_Text flag correctly. - llvm-profdata - llvm-link Reviewed By: rnk Differential Revision: https://reviews.llvm.org/D94313 Added: Modified: llvm/test/tools/llvm-profdata/csprof-dump.test llvm/test/tools/llvm-profdata/instr-remap.test llvm/tools/llvm-link/llvm-link.cpp llvm/tools/llvm-profdata/llvm-profdata.cpp Removed: diff --git a/llvm/test/tools/llvm-profdata/csprof-dump.test b/llvm/test/tools/llvm-profdata/csprof-dump.test index 39643dc38f20..a03b9d8a003e 100644 --- a/llvm/test/tools/llvm-profdata/csprof-dump.test +++ b/llvm/test/tools/llvm-profdata/csprof-dump.test @@ -27,5 +27,5 @@ Roundtrip test: RUN: llvm-profdata merge -o %t.0.profdata %S/Inputs/CSIR_profile.proftext RUN: llvm-profdata merge -text -o %t.0.proftext %t.0.profdata -RUN: diff %t.0.proftext %S/Inputs/CSIR_profile.proftext +RUN: diff -b %t.0.proftext %S/Inputs/CSIR_profile.proftext diff --git a/llvm/test/tools/llvm-profdata/instr-remap.test b/llvm/test/tools/llvm-profdata/instr-remap.test index 159b7374ac35..27fddf609581 100644 --- a/llvm/test/tools/llvm-profdata/instr-remap.test +++ b/llvm/test/tools/llvm-profdata/instr-remap.test @@ -1,2 +1,2 @@ ; RUN: llvm-profdata merge -text %S/Inputs/instr-remap.proftext -r %S/Inputs/instr-remap.remap -o %t.output -; RUN: diff %S/Inputs/instr-remap.expected %t.output +; RUN: diff -b %S/Inputs/instr-remap.expected %t.output diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp index 61d0c1561054..158b168107f1 100644 --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -456,7 +456,8 @@ int main(int argc, char **argv) { errs() << "Here's the assembly:\n" << *Composite; std::error_code EC; - ToolOutputFile Out(OutputFilename, EC, sys::fs::OF_None); + ToolOutputFile Out(OutputFilename, EC, + OutputAssembly ? sys::fs::OF_Text : sys::fs::OF_None); if (EC) { WithColor::error() << EC.message() << '\n'; return 1; diff --git a/llvm/tools/llvm-profdata/llvm-profdata.cpp b/llvm/tools/llvm-profdata/llvm-profdata.cpp index 122ffe73bf0f..ad188b6a5e92 100644 --- a/llvm/tools/llvm-profdata/llvm-profdata.cpp +++ b/llvm/tools/llvm-profdata/llvm-profdata.cpp @@ -296,7 +296,9 @@ static void writeInstrProfile(StringRef OutputFilename, ProfileFormat OutputFormat, InstrProfWriter &Writer) { std::error_code EC; - raw_fd_ostream Output(OutputFilename.data(), EC, sys::fs::OF_None); + raw_fd_ostream Output(OutputFilename.data(), EC, +OutputFormat == PF_Text ? sys::fs::OF_Text +: sys::fs::OF_None); if (EC) exitWithErrorCode(EC, OutputFilename); ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [clang] f770ec1 - [SystemZ][NFC]Move all SystemZ tests to init-s390x.c
Author: Abhina Sreeskantharajan Date: 2020-12-02T08:23:27-05:00 New Revision: f770ec1a4e8d9b274d205073e2c8b01d248cf9cb URL: https://github.com/llvm/llvm-project/commit/f770ec1a4e8d9b274d205073e2c8b01d248cf9cb DIFF: https://github.com/llvm/llvm-project/commit/f770ec1a4e8d9b274d205073e2c8b01d248cf9cb.diff LOG: [SystemZ][NFC]Move all SystemZ tests to init-s390x.c This patch moves all s390x tests in init.c and init-zos.c to init-s390x.c. Reviewed By: muiez Differential Revision: https://reviews.llvm.org/D92048 Added: clang/test/Preprocessor/init-s390x.c Modified: clang/test/Preprocessor/init.c Removed: clang/test/Preprocessor/init-zos.c diff --git a/clang/test/Preprocessor/init-s390x.c b/clang/test/Preprocessor/init-s390x.c new file mode 100644 index ..b0e45b5348ce --- /dev/null +++ b/clang/test/Preprocessor/init-s390x.c @@ -0,0 +1,205 @@ +// RUN: %clang_cc1 -E -dM -ffreestanding -triple=s390x-none-none -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix S390X %s +// RUN: %clang_cc1 -x c++ -E -dM -ffreestanding -triple=s390x-none-none -fno-signed-char < /dev/null | FileCheck -match-full-lines -check-prefix S390X -check-prefix S390X-CXX %s + +// S390X:#define __BIGGEST_ALIGNMENT__ 8 +// S390X:#define __CHAR16_TYPE__ unsigned short +// S390X:#define __CHAR32_TYPE__ unsigned int +// S390X:#define __CHAR_BIT__ 8 +// S390X:#define __CHAR_UNSIGNED__ 1 +// S390X:#define __DBL_DENORM_MIN__ 4.9406564584124654e-324 +// S390X:#define __DBL_DIG__ 15 +// S390X:#define __DBL_EPSILON__ 2.2204460492503131e-16 +// S390X:#define __DBL_HAS_DENORM__ 1 +// S390X:#define __DBL_HAS_INFINITY__ 1 +// S390X:#define __DBL_HAS_QUIET_NAN__ 1 +// S390X:#define __DBL_MANT_DIG__ 53 +// S390X:#define __DBL_MAX_10_EXP__ 308 +// S390X:#define __DBL_MAX_EXP__ 1024 +// S390X:#define __DBL_MAX__ 1.7976931348623157e+308 +// S390X:#define __DBL_MIN_10_EXP__ (-307) +// S390X:#define __DBL_MIN_EXP__ (-1021) +// S390X:#define __DBL_MIN__ 2.2250738585072014e-308 +// S390X:#define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__ +// S390X:#define __FLT_DENORM_MIN__ 1.40129846e-45F +// S390X:#define __FLT_DIG__ 6 +// S390X:#define __FLT_EPSILON__ 1.19209290e-7F +// S390X:#define __FLT_EVAL_METHOD__ 0 +// S390X:#define __FLT_HAS_DENORM__ 1 +// S390X:#define __FLT_HAS_INFINITY__ 1 +// S390X:#define __FLT_HAS_QUIET_NAN__ 1 +// S390X:#define __FLT_MANT_DIG__ 24 +// S390X:#define __FLT_MAX_10_EXP__ 38 +// S390X:#define __FLT_MAX_EXP__ 128 +// S390X:#define __FLT_MAX__ 3.40282347e+38F +// S390X:#define __FLT_MIN_10_EXP__ (-37) +// S390X:#define __FLT_MIN_EXP__ (-125) +// S390X:#define __FLT_MIN__ 1.17549435e-38F +// S390X:#define __FLT_RADIX__ 2 +// S390X:#define __INT16_C_SUFFIX__ +// S390X:#define __INT16_FMTd__ "hd" +// S390X:#define __INT16_FMTi__ "hi" +// S390X:#define __INT16_MAX__ 32767 +// S390X:#define __INT16_TYPE__ short +// S390X:#define __INT32_C_SUFFIX__ +// S390X:#define __INT32_FMTd__ "d" +// S390X:#define __INT32_FMTi__ "i" +// S390X:#define __INT32_MAX__ 2147483647 +// S390X:#define __INT32_TYPE__ int +// S390X:#define __INT64_C_SUFFIX__ L +// S390X:#define __INT64_FMTd__ "ld" +// S390X:#define __INT64_FMTi__ "li" +// S390X:#define __INT64_MAX__ 9223372036854775807L +// S390X:#define __INT64_TYPE__ long int +// S390X:#define __INT8_C_SUFFIX__ +// S390X:#define __INT8_FMTd__ "hhd" +// S390X:#define __INT8_FMTi__ "hhi" +// S390X:#define __INT8_MAX__ 127 +// S390X:#define __INT8_TYPE__ signed char +// S390X:#define __INTMAX_C_SUFFIX__ L +// S390X:#define __INTMAX_FMTd__ "ld" +// S390X:#define __INTMAX_FMTi__ "li" +// S390X:#define __INTMAX_MAX__ 9223372036854775807L +// S390X:#define __INTMAX_TYPE__ long int +// S390X:#define __INTMAX_WIDTH__ 64 +// S390X:#define __INTPTR_FMTd__ "ld" +// S390X:#define __INTPTR_FMTi__ "li" +// S390X:#define __INTPTR_MAX__ 9223372036854775807L +// S390X:#define __INTPTR_TYPE__ long int +// S390X:#define __INTPTR_WIDTH__ 64 +// S390X:#define __INT_FAST16_FMTd__ "hd" +// S390X:#define __INT_FAST16_FMTi__ "hi" +// S390X:#define __INT_FAST16_MAX__ 32767 +// S390X:#define __INT_FAST16_TYPE__ short +// S390X:#define __INT_FAST32_FMTd__ "d" +// S390X:#define __INT_FAST32_FMTi__ "i" +// S390X:#define __INT_FAST32_MAX__ 2147483647 +// S390X:#define __INT_FAST32_TYPE__ int +// S390X:#define __INT_FAST64_FMTd__ "ld" +// S390X:#define __INT_FAST64_FMTi__ "li" +// S390X:#define __INT_FAST64_MAX__ 9223372036854775807L +// S390X:#define __INT_FAST64_TYPE__ long int +// S390X:#define __INT_FAST8_FMTd__ "hhd" +// S390X:#define __INT_FAST8_FMTi__ "hhi" +// S390X:#define __INT_FAST8_MAX__ 127 +// S390X:#define __INT_FAST8_TYPE__ signed char +// S390X:#define __INT_LEAST16_FMTd__ "hd" +// S390X:#define __INT_LEAST16_FMTi__ "hi" +// S390X:#define __INT_LEAST16_MAX__ 32767 +// S390X:#define __INT_LEAST16_TYPE__ short +// S390X:#define __INT_LEAST32_FMTd__ "d" +// S390X:#define __INT_LEAST32_FMTi__ "i" +