Fix defines.txt test failure on Windows targets

[thopre]

Summary

FileCheck error messages embedding the name of the FileCheck tool vary
in the casing of that name. On Unix it displays 'FileCheck' but on some
Windows system at least it shows 'filecheck.exe' as can be seen in the
defines.txt failure logs available at [1]. This changes the testcase to
only check the error message and leave out the program name.

[1] http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/23393/steps/test/logs/stdio

[jhenderson]

llvm/test/FileCheck/defines.txt

27

Maybe we just don't need to test that "FileCheck" appears in the error message at all? I'm not really convinced it belongs in the error message anyway, but that's a separate issue.

[thopre]

llvm/test/FileCheck/defines.txt

27

I was wondering about that myself. So what about:

; ERRCLIEQ2: for the -D option: requires a value!

[jhenderson]

I'm about to leave the office for the day, but as long as you remove the portion of the check as suggested, I'm happy to give this an LGTM now.

llvm/test/FileCheck/defines.txt

27

Yes, exactly.

[thopre]

Remove program name from the string being checked for

[thopre]

Someone beat me to it overnight and went for my initial approach. Is it worth a separate commit to stop testing for FileCheck's name in the error string as suggested or should I abandon this revision?

[jhenderson]

I guess you might as well abandon it. Up to you though.

[thopre]

Abandon it as issue has already been fixed.

llvm/test/FileCheck/defines.txt

 ; ERRMSG: defines.txt:[[@LINE-7]]:1: note: possible intended match here
 
 ; NOT-ERRMSG: defines.txt:[[@LINE-7]]:12: error: {{NOT}}-NOT: excluded string found in input
 ; NOT-ERRMSG: defines.txt:[[@LINE-10]]:1: note: found here
 ; NOT-ERRMSG: defines.txt:[[@LINE-11]]:1: note: with variable "VALUE" equal to "10"
 
 ; ERRCLIEQ1: Missing equal sign in command-line definition '-DVALUE10'
 
-; ERRCLIEQ2: FileCheck{{[^:]*}}: for the -D option: requires a value!
+; ERRCLIEQ2: for the -D option: requires a value!
 
 ; ERRCLIVAR1: Missing pattern variable name in command-line definition '-D=10'
 
 ; ERRCLIVAR2: Missing pattern variable name in command-line definition '-D='
 
 Empty value = @@
 ; EMPTY: Empty value = @[[VALUE]]@