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 < %t.log -MISSING: 'nosuchfile.obj': {{.*}}{{[Nn]}}o such file or directory +MISSING: 'nosuchfile.obj': {{[Nn]}}o such file or directory # RUN: lld-link --version | FileCheck -check-prefix=VERSION %s VERSION: {{LLD [0-9]+\.[0-9]+}} diff --git a/lld/test/COFF/manifestinput-error.test b/lld/test/COFF/manifestinput-error.test index 6b86b87ad3e8..ea61bae2f7c0 100644 --- a/lld/test/COFF/manifestinput-error.test +++ b/lld/test/COFF/manifestinput-error.test @@ -7,4 +7,4 @@ # RUN: /manifestuac:"level='requireAdministrator'" \ # RUN: /manifestinput:%p/Inputs/manifestinput.test %t.obj 2>&1 | FileCheck %s -# CHECK: error: unable to find mt.exe in PATH: {{.*}}{{[Nn]}}o such file or directory +# CHECK: error: unable to find mt.exe in PATH: {{[Nn]}}o such file or directory diff --git a/lld/test/COFF/nodefaultlib.test b/lld/test/COFF/nodefaultlib.test index 01e727dbffa3..61a31c21b6cc 100644 --- a/lld/test/COFF/nodefaultlib.test +++ b/lld/test/COFF/nodefaultlib.test @@ -19,8 +19,8 @@ # RUN: /nodefaultlib:std64.lib >& %t.log || true # RUN: FileCheck -check-prefix=CHECK3 %s < %t.log -CHECK1: error: could not open 'hello64.obj': {{.*}}{{[Nn]}}o such file or directory -CHECK2: error: could not open 'hello64': {{.*}}{{[Nn]}}o such file or directory +CHECK1: error: could not open 'hello64.obj': {{[Nn]}}o such file or directory +CHECK2: error: could not open 'hello64': {{[Nn]}}o such file or directory CHECK3: error: undefined symbol: MessageBoxA CHECK3-NEXT: >>> referenced by {{.*}}hello64.obj:(main) diff --git a/lld/test/COFF/pdb-type-server-invalid-signature.yaml b/lld/test/COFF/pdb-type-server-invalid-signature.yaml index 3c34f96d14a8..612bd74eeaa8 100644 --- a/lld/test/COFF/pdb-type-server-invalid-signature.yaml +++ b/lld/test/COFF/pdb-type-server-invalid-signature.yaml @@ -22,8 +22,8 @@ # RUN: cp %S/Inputs/pdb- diff -cl.pdb %T # RUN: lld-link %t3.obj -out:%t3.exe -debug -pdb:%t3.pdb -nodefaultlib -entry:main 2>&1 | FileCheck %s -check-prefix=INVALID-PATH -allow-empty -# INVALID-PATH-NOT: warning: Cannot use debug info for '{{.*}}3.obj' [LNK4099] -# INVALID-PATH-NOT: failed to load reference 'c:\some_invalid_path_AABB98765\pdb- diff -cl.pdb': {{.*}}{{[Nn]}}o such file or directory +# INVALID-PATH-NOT: warning: Cannot use debug info for '{{.*}}3.obj' [LNK4099] +# INVALID-PATH-NOT: failed to load reference 'c:\some_invalid_path_AABB98765\pdb- diff -cl.pdb': {{[Nn]}}o such file or directory --- !COFF header: diff --git a/lld/test/ELF/archive-thin-missing-member.s b/lld/test/ELF/archive-thin-missing-member.s index 9a8e9bba7ee6..4db1376cfaf2 100644 --- a/lld/test/ELF/archive-thin-missing-member.s +++ b/lld/test/ELF/archive-thin-missing-member.s @@ -9,17 +9,17 @@ # Test error when loading symbols from missing thin archive member. # RUN: not ld.lld --entry=_Z1fi %t-no-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR1 -# ERR1: {{.*}}-no-syms.a: could not get the buffer for a child of the archive: '{{.*}}.o': {{.*}}{{[Nn]}}o such file or directory +# ERR1: {{.*}}-no-syms.a: could not get the buffer for a child of the archive: '{{.*}}.o': {{[Nn]}}o such file or directory # Test error when thin archive has symbol table but member is missing. # RUN: not ld.lld --entry=_Z1fi -m elf_amd64_fbsd %t-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR2 -# ERR2: {{.*}}-syms.a: could not get the buffer for the member defining symbol f(int): '{{.*}}.o': {{.*}}{{[Nn]}}o such file or directory +# ERR2: {{.*}}-syms.a: could not get the buffer for the member defining symbol f(int): '{{.*}}.o': {{[Nn]}}o such file or directory # RUN: not ld.lld --entry=_Z1fi --no-demangle -m elf_amd64_fbsd %t-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR2MANGLE -# ERR2MANGLE: {{.*}}-syms.a: could not get the buffer for the member defining symbol _Z1fi: '{{.*}}.o': {{.*}}{{[Nn]}}o such file or directory +# ERR2MANGLE: {{.*}}-syms.a: could not get the buffer for the member defining symbol _Z1fi: '{{.*}}.o': {{[Nn]}}o such file or directory # Test error when thin archive is linked using --whole-archive but member is missing. # RUN: not ld.lld --entry=_Z1fi --whole-archive %t-syms.a -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR3 -# ERR3: {{.*}}-syms.a: could not get the buffer for a child of the archive: '{{.*}}.o': {{.*}}{{[Nn]}}o such file or directory +# ERR3: {{.*}}-syms.a: could not get the buffer for a child of the archive: '{{.*}}.o': {{[Nn]}}o such file or directory .global _Z1fi _Z1fi: diff --git a/lld/test/ELF/basic.s b/lld/test/ELF/basic.s index e952472d08f0..f6954b143493 100644 --- a/lld/test/ELF/basic.s +++ b/lld/test/ELF/basic.s @@ -220,7 +220,7 @@ _start: # RUN: not ld.lld %t.foo -o /dev/null 2>&1 | \ # RUN: FileCheck --check-prefix=MISSING %s -# MISSING: cannot open {{.*}}.foo: {{.*}}{{[Nn]}}o such file or directory +# MISSING: cannot open {{.*}}.foo: {{[Nn]}}o such file or directory # RUN: not ld.lld -o /dev/null 2>&1 | \ # RUN: FileCheck --check-prefix=NO_INPUT %s @@ -228,7 +228,7 @@ _start: # RUN: not ld.lld %t.no.such.file -o /dev/null 2>&1 | \ # RUN: FileCheck --check-prefix=CANNOT_OPEN %s -# CANNOT_OPEN: cannot open {{.*}}.no.such.file: {{.*}}{{[Nn]}}o such file or directory +# CANNOT_OPEN: cannot open {{.*}}.no.such.file: {{[Nn]}}o such file or directory # RUN: not ld.lld --foo 2>&1 | FileCheck --check-prefix=UNKNOWN %s # UNKNOWN: unknown argument '--foo' diff --git a/lld/test/ELF/symbol-ordering-file.s b/lld/test/ELF/symbol-ordering-file.s index ae88c28f5fe4..f6776cdb6f67 100644 --- a/lld/test/ELF/symbol-ordering-file.s +++ b/lld/test/ELF/symbol-ordering-file.s @@ -43,7 +43,7 @@ # RUN: not ld.lld --symbol-ordering-file=%t.nonexistent %t.o -o %t3.out 2>&1 | \ # RUN: FileCheck %s --check-prefix=ERR -DFILE=%t.nonexistent -# ERR: error: cannot open [[FILE]]: {{.*}}{{[Nn]}}o such file or directory +# ERR: error: cannot open [[FILE]]: {{[Nn]}}o such file or directory ## Show that an empty ordering file can be handled (symbols remain in their ## normal order). diff --git a/llvm/test/DebugInfo/symbolize-missing-file.test b/llvm/test/DebugInfo/symbolize-missing-file.test index 8665b2ff1dd2..2762af4ff5da 100644 --- a/llvm/test/DebugInfo/symbolize-missing-file.test +++ b/llvm/test/DebugInfo/symbolize-missing-file.test @@ -1,3 +1,3 @@ RUN: llvm-symbolizer --obj=unexisting-file 0x1234 2>&1 | FileCheck %s -CHECK: LLVMSymbolizer: error reading file: {{.*}}{{[Nn]}}o such file or directory +CHECK: LLVMSymbolizer: error reading file: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/dsymutil/X86/papertrail-warnings.test b/llvm/test/tools/dsymutil/X86/papertrail-warnings.test index 6f0a5e11a7c1..1954994c9e1e 100644 --- a/llvm/test/tools/dsymutil/X86/papertrail-warnings.test +++ b/llvm/test/tools/dsymutil/X86/papertrail-warnings.test @@ -8,7 +8,7 @@ CHECK: DW_AT_name {{.*}}"/Inputs/basic1.macho.x86_64.o" CHECK: DW_TAG_constant [2] CHECK: DW_AT_name {{.*}}"dsymutil_warning" CHECK: DW_AT_artificial [DW_FORM_flag] (0x01) -CHECK: DW_AT_const_value {{.*}}"unable to open object file: {{.*}}{{[Nn]}}o such file or directory" +CHECK: DW_AT_const_value {{.*}}"unable to open object file: {{[Nn]}}o such file or directory" CHECK: NULL CHECK: Compile Unit: CHECK: DW_TAG_compile_unit [1] * @@ -17,7 +17,7 @@ CHECK: DW_AT_name {{.*}}"/Inputs/basic2.macho.x86_64.o" CHECK: DW_TAG_constant [2] CHECK: DW_AT_name {{.*}}"dsymutil_warning" CHECK: DW_AT_artificial [DW_FORM_flag] (0x01) -CHECK: DW_AT_const_value {{.*}}"unable to open object file: {{.*}}{{[Nn]}}o such file or directory" +CHECK: DW_AT_const_value {{.*}}"unable to open object file: {{[Nn]}}o such file or directory" CHECK: NULL CHECK: Compile Unit: CHECK: DW_TAG_compile_unit [1] * @@ -26,5 +26,5 @@ CHECK: DW_AT_name {{.*}}"/Inputs/basic3.macho.x86_64.o" CHECK: DW_TAG_constant [2] CHECK: DW_AT_name {{.*}}"dsymutil_warning" CHECK: DW_AT_artificial [DW_FORM_flag] (0x01) -CHECK: DW_AT_const_value {{.*}}"unable to open object file: {{.*}}{{[Nn]}}o such file or directory" +CHECK: DW_AT_const_value {{.*}}"unable to open object file: {{[Nn]}}o such file or directory" CHECK: NULL diff --git a/llvm/test/tools/llvm-ar/missing-thin-archive-member.test b/llvm/test/tools/llvm-ar/missing-thin-archive-member.test index 7dd9f26a40ba..c1d67cdce2f1 100644 --- a/llvm/test/tools/llvm-ar/missing-thin-archive-member.test +++ b/llvm/test/tools/llvm-ar/missing-thin-archive-member.test @@ -14,4 +14,4 @@ # RUN: rm %t-temp.txt # RUN: not llvm-ar p %t-archive.a 2>&1 | FileCheck %s --check-prefix=DELETED -# DELETED: error: {{.*}}{{[Nn]}}o such file or directory +# DELETED: error: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-ar/replace.test b/llvm/test/tools/llvm-ar/replace.test index ce6658d3f934..389ac60270c4 100644 --- a/llvm/test/tools/llvm-ar/replace.test +++ b/llvm/test/tools/llvm-ar/replace.test @@ -91,7 +91,7 @@ # RUN: not llvm-ar r %t/missing.a %t/missing.txt 2>&1 \ # RUN: | FileCheck %s --check-prefix=MISSING-FILE -DFILE=%t/missing.txt -# MISSING-FILE: error: [[FILE]]: {{.*}}{{[Nn]}}o such file or directory +# MISSING-FILE: error: [[FILE]]: {{[Nn]}}o such file or directory ## Create and Replace member of thin archive: # RUN: llvm-ar rcT %t/thin.a %t/1.o %t/2.o %t/3.o diff --git a/llvm/test/tools/llvm-ar/response.test b/llvm/test/tools/llvm-ar/response.test index bdb6ae03d129..d9262481172a 100644 --- a/llvm/test/tools/llvm-ar/response.test +++ b/llvm/test/tools/llvm-ar/response.test @@ -34,8 +34,8 @@ # RUN: echo -e 'rc %/t.a blah\\foo' > %t-rsp.txt # RUN: not llvm-ar --rsp-quoting=windows @%t-rsp.txt 2>&1 | \ # RUN: FileCheck %s --check-prefix=WIN -# WIN: error: blah\foo: {{.*}}{{[Nn]}}o such file or directory +# WIN: error: blah\foo: {{[Nn]}}o such file or directory # RUN: not llvm-ar -rsp-quoting posix @%t-rsp.txt 2>&1 | \ # RUN: FileCheck %s --check-prefix=POSIX -# POSIX: error: blahfoo: {{.*}}{{[Nn]}}o such file or directory +# POSIX: error: blahfoo: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-cxxdump/trivial.test b/llvm/test/tools/llvm-cxxdump/trivial.test index 6a2582692520..8df0bc32e1e3 100644 --- a/llvm/test/tools/llvm-cxxdump/trivial.test +++ b/llvm/test/tools/llvm-cxxdump/trivial.test @@ -63,4 +63,4 @@ ELF-I386-NEXT: _ZTV1A[8]: _ZN1A1fEv MIXEDARCOFF-I386: ??_7S@@6B@[0]: ??_R4S@@6B@ RUN: not llvm-cxxdump %t.blah 2>&1 | FileCheck --check-prefix=ENOENT %s -ENOENT: {{.*}}.blah: error: {{.*}}{{[Nn]}}o such file or directory +ENOENT: {{.*}}.blah: error: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-libtool-darwin/filelist.test b/llvm/test/tools/llvm-libtool-darwin/filelist.test index a8d8dac95a49..bb606f0585fa 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 diff --git a/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll b/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll index c76f3f0a8052..948c52202204 100644 --- a/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll +++ b/llvm/test/tools/llvm-lto2/X86/stats-file-option.ll @@ -22,4 +22,4 @@ define void @patatino() { ; Try to save statistics to an invalid file. ; RUN: not llvm-lto2 run %t1.bc -o %t.o -r %t1.bc,patatino,px \ ; RUN: -stats-file=%t2/foo.stats 2>&1 | FileCheck --check-prefix=ERROR %s -; ERROR: LTO::run failed: {{.*}}{{[Nn]}}o such file or directory +; ERROR: LTO::run failed: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-mc/basic.test b/llvm/test/tools/llvm-mc/basic.test index 695329c3e61d..c7480dc6a87f 100644 --- a/llvm/test/tools/llvm-mc/basic.test +++ b/llvm/test/tools/llvm-mc/basic.test @@ -1,3 +1,3 @@ # RUN: not llvm-mc %t.blah -o /dev/null 2>&1 | FileCheck --check-prefix=ENOENT %s -# ENOENT: {{.*}}.blah: {{.*}}{{[Nn]}}o such file or directory +# ENOENT: {{.*}}.blah: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-mca/invalid_input_file_name.test b/llvm/test/tools/llvm-mca/invalid_input_file_name.test index 5bc671932494..27fa972f29a4 100644 --- a/llvm/test/tools/llvm-mca/invalid_input_file_name.test +++ b/llvm/test/tools/llvm-mca/invalid_input_file_name.test @@ -1,3 +1,3 @@ # RUN: not llvm-mca %t.blah -o /dev/null 2>&1 | FileCheck --check-prefix=ENOENT %s -# ENOENT: {{.*}}.blah: {{.*}}{{[Nn]}}o such file or directory +# ENOENT: {{.*}}.blah: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-ml/basic.test b/llvm/test/tools/llvm-ml/basic.test index f9df410bde75..960eb47f6cc5 100644 --- a/llvm/test/tools/llvm-ml/basic.test +++ b/llvm/test/tools/llvm-ml/basic.test @@ -1,3 +1,3 @@ # RUN: not llvm-ml %t.blah.asm /Fo /dev/null 2>&1 | FileCheck --check-prefix=ENOENT %s -# ENOENT: {{.*}}.blah.asm: {{.*}}{{[Nn]}}o such file or directory +# ENOENT: {{.*}}.blah.asm: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/llvm-objcopy/COFF/add-section.test b/llvm/test/tools/llvm-objcopy/COFF/add-section.test index 464c6d7c1b43..e4938db9135f 100644 --- a/llvm/test/tools/llvm-objcopy/COFF/add-section.test +++ b/llvm/test/tools/llvm-objcopy/COFF/add-section.test @@ -61,7 +61,7 @@ ## to be added does not exist. # RUN: not llvm-objcopy --add-section=.another.section=%t2 %t %t3 2>&1 | FileCheck -DFILE1=%t -DFILE2=%t2 %s --check-prefixes=ERR1 -# ERR1: error: '[[FILE1]]': '[[FILE2]]': {{.*}}{{[Nn]}}o such file or directory +# ERR1: error: '[[FILE1]]': '[[FILE2]]': {{[Nn]}}o such file or directory ## Another negative test for invalid --add-sections command line argument. # RUN: not llvm-objcopy --add-section=.another.section %t %t3 2>&1 | FileCheck %s --check-prefixes=ERR2 diff --git a/llvm/test/tools/llvm-objcopy/ELF/add-section.test b/llvm/test/tools/llvm-objcopy/ELF/add-section.test index a9de79b87bc3..290761f82bc1 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/add-section.test +++ b/llvm/test/tools/llvm-objcopy/ELF/add-section.test @@ -39,7 +39,7 @@ Sections: ## to be added does not exist. # RUN: not llvm-objcopy --add-section=.section.name=%t.missing %t %t.out 2>&1 | FileCheck -DFILE1=%t -DFILE2=%t.missing %s --check-prefixes=ERR1 -# ERR1: error: '[[FILE1]]': '[[FILE2]]': {{.*}}{{[Nn]}}o such file or directory +# ERR1: error: '[[FILE1]]': '[[FILE2]]': {{[Nn]}}o such file or directory ## Negative test for invalid --add-sections argument - missing '='. # RUN: not llvm-objcopy --add-section=.section.name %t %t.out 2>&1 | FileCheck %s --check-prefixes=ERR2 diff --git a/llvm/test/tools/llvm-objcopy/ELF/error-format.test b/llvm/test/tools/llvm-objcopy/ELF/error-format.test index 2dcfd9ee0b35..8a74fb0d1340 100644 --- a/llvm/test/tools/llvm-objcopy/ELF/error-format.test +++ b/llvm/test/tools/llvm-objcopy/ELF/error-format.test @@ -3,7 +3,7 @@ # RUN: not llvm-objcopy %S/non-existent 2>&1 | FileCheck --check-prefix=ERR %s -DTOOL=objcopy # RUN: not llvm-strip %S/non-existent 2>&1 | FileCheck --check-prefix=ERR %s -DTOOL=strip -# ERR: llvm-[[TOOL]]{{(\.exe)?}}: error: '{{.*}}': {{.*}}{{[Nn]}}o such file or directory +# ERR: llvm-[[TOOL]]{{(\.exe)?}}: error: '{{.*}}': {{[Nn]}}o such file or directory ## Currently llvm-objcopy does not issue warnings, so it is not tested. diff --git a/llvm/test/tools/llvm-objcopy/MachO/add-section-error.test b/llvm/test/tools/llvm-objcopy/MachO/add-section-error.test index 62422adc4e7c..a6847ec878bf 100644 --- a/llvm/test/tools/llvm-objcopy/MachO/add-section-error.test +++ b/llvm/test/tools/llvm-objcopy/MachO/add-section-error.test @@ -6,7 +6,7 @@ ## Error case 1: Nonexistent input file is specified by --add-section. # RUN: not llvm-objcopy --add-section __TEXT,__text=%t.missing %t %t.nonexistent-file 2>&1 \ # RUN: | FileCheck %s -DINPUT=%t -DSECTION_DATA_FILE=%t.missing --check-prefix=NONEXSITENT-FILE -# NONEXSITENT-FILE: error: '[[INPUT]]': '[[SECTION_DATA_FILE]]': {{.*}}{{[Nn]}}o such file or directory +# NONEXSITENT-FILE: error: '[[INPUT]]': '[[SECTION_DATA_FILE]]': {{[Nn]}}o such file or directory ## Error case 2: Too long segment name. # RUN: not llvm-objcopy --add-section __TOOOOOOOOO_LONG,__text=%t.data %t %t.too-long-seg-name 2>&1 \ diff --git a/llvm/test/tools/llvm-objcopy/redefine-symbols.test b/llvm/test/tools/llvm-objcopy/redefine-symbols.test index f06427212f28..8f6cba0c8243 100644 --- a/llvm/test/tools/llvm-objcopy/redefine-symbols.test +++ b/llvm/test/tools/llvm-objcopy/redefine-symbols.test @@ -14,7 +14,7 @@ # MISSING-SYM-NAME: error: {{.*}}.rename.txt:2: missing new symbol name # RUN: not llvm-objcopy --redefine-syms %t.rename-none.txt %t /dev/null 2>&1 | FileCheck %s --check-prefix=NO-FILE -# NO-FILE: error: '{{.*}}.rename-none.txt': {{.*}}{{[Nn]}}o such file or directory +# NO-FILE: error: '{{.*}}.rename-none.txt': {{[Nn]}}o such file or directory !ELF FileHeader: diff --git a/llvm/test/tools/llvm-profdata/weight-instr.test b/llvm/test/tools/llvm-profdata/weight-instr.test index d35997e10439..83ea1ca6f6fa 100644 --- a/llvm/test/tools/llvm-profdata/weight-instr.test +++ b/llvm/test/tools/llvm-profdata/weight-instr.test @@ -74,7 +74,7 @@ INVALID_WEIGHT: error: Input weight must be a positive integer. 4- Bad merge: input path does not exist RUN: not llvm-profdata merge -instr -weighted-input=3,%p/Inputs/does-not-exist.profdata -weighted-input=2,%p/Inputs/does-not-exist-either.profdata -o %t.out 2>&1 | FileCheck %s -check-prefix=INVALID_INPUT -INVALID_INPUT: {{.*}}: {{.*}}does-not-exist.profdata: {{.*}}{{[Nn]}}o such file or directory +INVALID_INPUT: {{.*}}: {{.*}}does-not-exist.profdata: {{[Nn]}}o such file or directory 5- No inputs RUN: not llvm-profdata merge -instr -o %t.out 2>&1 | FileCheck %s -check-prefix=NO_INPUT diff --git a/llvm/test/tools/llvm-profdata/weight-sample.test b/llvm/test/tools/llvm-profdata/weight-sample.test index cd9ecdbec829..635e6212e790 100644 --- a/llvm/test/tools/llvm-profdata/weight-sample.test +++ b/llvm/test/tools/llvm-profdata/weight-sample.test @@ -49,7 +49,7 @@ INVALID_WEIGHT: error: Input weight must be a positive integer. 4- Bad merge: input path does not exist RUN: not llvm-profdata merge -sample -weighted-input=3,%p/Inputs/does-not-exist.proftext -weighted-input=2,%p/Inputs/does-not-exist-either.proftext -o %t.out 2>&1 | FileCheck %s -check-prefix=INVALID_INPUT -INVALID_INPUT: {{.*}}: {{.*}}does-not-exist.proftext: {{.*}}{{[Nn]}}o such file or directory +INVALID_INPUT: {{.*}}: {{.*}}does-not-exist.proftext: {{[Nn]}}o such file or directory 5- No inputs RUN: not llvm-profdata merge -sample -o %t.out 2>&1 | FileCheck %s -check-prefix=NO_INPUT diff --git a/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test b/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test index 0a8eca83ccf1..996fae42cedb 100644 --- a/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test +++ b/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test @@ -16,7 +16,7 @@ # RUN: rm a/b/1.o # RUN: not llvm-readobj --file-headers a/relative.a 2>&1 | FileCheck %s --check-prefix=ERR1 # RUN: not llvm-readelf --file-headers a/relative.a 2>&1 | FileCheck %s --check-prefix=ERR1 -# ERR1: error: 'a/relative.a': 'b/1.o': {{.*}}{{[Nn]}}o such file or directory +# ERR1: error: 'a/relative.a': 'b/1.o': {{[Nn]}}o such file or directory # RUN: mkdir -p %t/c # RUN: yaml2obj %s -o a/b/1.o @@ -30,7 +30,7 @@ # RUN: rm a/b/1.o # RUN: not llvm-readobj --file-headers %/t/c/absolute.a 2>&1 | FileCheck %s --check-prefix=ERR2 -DDIR=%/t # RUN: not llvm-readelf --file-headers %/t/c/absolute.a 2>&1 | FileCheck %s --check-prefix=ERR2 -DDIR=%/t -# ERR2: error: '[[DIR]]/c/absolute.a': '[[DIR]]/a/b/1.o': {{.*}}{{[Nn]}}o such file or directory +# ERR2: error: '[[DIR]]/c/absolute.a': '[[DIR]]/a/b/1.o': {{[Nn]}}o such file or directory --- !ELF FileHeader: diff --git a/llvm/test/tools/llvm-readobj/basic.test b/llvm/test/tools/llvm-readobj/basic.test index db6de66b7bf5..ddf6acb5c44d 100644 --- a/llvm/test/tools/llvm-readobj/basic.test +++ b/llvm/test/tools/llvm-readobj/basic.test @@ -2,7 +2,7 @@ RUN: not llvm-readobj %t.blah 2>&1 | FileCheck --check-prefix=ENOENT -DTOOL=readobj %s RUN: not llvm-readelf %t.blah 2>&1 | FileCheck --check-prefix=ENOENT -DTOOL=readelf %s -ENOENT: llvm-[[TOOL]]{{(\.exe)?}}: error: '{{.*}}.blah': {{.*}}{{[Nn]}}o such file or directory +ENOENT: llvm-[[TOOL]]{{(\.exe)?}}: error: '{{.*}}.blah': {{[Nn]}}o such file or directory # Test case with no input file. RUN: not llvm-readobj 2>&1 | FileCheck %s --check-prefix=NO-FILE diff --git a/llvm/test/tools/llvm-readobj/thin-archive.test b/llvm/test/tools/llvm-readobj/thin-archive.test index 17782293688e..d13ae23e1b89 100644 --- a/llvm/test/tools/llvm-readobj/thin-archive.test +++ b/llvm/test/tools/llvm-readobj/thin-archive.test @@ -60,7 +60,7 @@ # MISSING: File: {{.*}}1.o # MISSING: Format: elf64-x86-64 # MISSING-NOT: File: {{.*}}3.o -# ERR: error: '{{.*}}.a': '{{.*}}2.o': {{.*}}{{[Nn]}}o such file or directory +# ERR: error: '{{.*}}.a': '{{.*}}2.o': {{[Nn]}}o such file or directory --- !ELF FileHeader: diff --git a/llvm/test/tools/llvm-size/no-input.test b/llvm/test/tools/llvm-size/no-input.test index 6be4a24171e8..37e5745bf177 100644 --- a/llvm/test/tools/llvm-size/no-input.test +++ b/llvm/test/tools/llvm-size/no-input.test @@ -1,7 +1,7 @@ ## Show that llvm-size emits an error if passed in a non-existent file. # RUN: not llvm-size %t.blah 2>&1 | FileCheck %s -DFILE=%t.blah --check-prefix=ENOENT -# ENOENT: {{.*}}llvm-size{{.*}}: error: '[[FILE]]': {{.*}}{{[Nn]}}o such file or directory +# ENOENT: {{.*}}llvm-size{{.*}}: error: '[[FILE]]': {{[Nn]}}o such file or directory ## Show that llvm-size reads a.out if not passed any file. diff --git a/llvm/test/tools/llvm-xray/X86/no-such-file.txt b/llvm/test/tools/llvm-xray/X86/no-such-file.txt index d647b528ccad..69fc43f9625b 100644 --- a/llvm/test/tools/llvm-xray/X86/no-such-file.txt +++ b/llvm/test/tools/llvm-xray/X86/no-such-file.txt @@ -1,4 +1,4 @@ ; RUN: not llvm-xray extract no-such-file 2>&1 | FileCheck %s ; CHECK: llvm-xray: Cannot extract instrumentation map from 'no-such-file'. -; CHECK-NEXT: {{.*}}{{[Nn]}}o such file or directory +; CHECK-NEXT: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/obj2yaml/invalid_input_file.test b/llvm/test/tools/obj2yaml/invalid_input_file.test index 583e4677b2a8..0f1bac1be01a 100644 --- a/llvm/test/tools/obj2yaml/invalid_input_file.test +++ b/llvm/test/tools/obj2yaml/invalid_input_file.test @@ -1,3 +1,3 @@ # RUN: not obj2yaml %p/path/does/not/exist 2>&1 | FileCheck %s -# CHECK: Error reading file: {{.*}}/path/does/not/exist: {{.*}}{{[Nn]}}o such file or directory +# CHECK: Error reading file: {{.*}}/path/does/not/exist: {{[Nn]}}o such file or directory diff --git a/llvm/test/tools/yaml2obj/output-file.yaml b/llvm/test/tools/yaml2obj/output-file.yaml index e3df91a280f6..e900291fc4c0 100644 --- a/llvm/test/tools/yaml2obj/output-file.yaml +++ b/llvm/test/tools/yaml2obj/output-file.yaml @@ -9,7 +9,7 @@ # RUN: not yaml2obj -o %p/path/does/not/exist 2>&1 | FileCheck %s -# CHECK: yaml2obj: error: failed to open '{{.*}}/path/does/not/exist': {{.*}}{{[Nn]}}o such file or directory +# CHECK: yaml2obj: error: failed to open '{{.*}}/path/does/not/exist': {{[Nn]}}o such file or directory !ELF FileHeader: _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
