[clang-tidy] allow tests to use --config-file instead of --config

[amurzeau]

Summary

The previous way to test hungarian notation doesn't check CHECK-FIXES.

This will allow readability-identifier-naming tests of Hungarian
notation to keep the use of an external .clang-tidy file (not embedded
within the .cpp test file) and properly check CHECK-FIXES.

Also, it turns out the hungarian notation tests use the wrong
.clang-tidy file, so fix that too to make these tests ok.

This is a part of a fix for issue https://github.com/llvm/llvm-project/issues/60670.

[PiotrZSL]

clang-tools-extra/test/clang-tidy/check_clang_tidy.py

109–110

clang-tidy works with -config and with --config.
But in documentation there is --config.

This python script should be updated to accept both single and double dash arguments for config.

clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp

1

maybe double -- for config-file ?

--config-file=<string>         -
                                 Specify the path of .clang-tidy or custom config file:
                                  e.g. --config-file=/some/path/myTidyConfigFile
                                 This option internally works exactly the same way as
                                  --config option after reading specified config file.

[Eugene.Zelenko]

clang-tools-extra/test/clang-tidy/check_clang_tidy.py

109–110

Please follow 80 characters limit.

[carlosgalvezp]

LGTM except the comments left by other reviewers! Marking it as "Request Changes" for visibility.

[amurzeau]

Allow use of --config and --config-file (with double dashes)

[carlosgalvezp]

LGTM, thanks for the fix!

[amurzeau]

I do not have commit access to the repo, can someone commit this patch for me ?

clang-tools-extra/test/clang-tidy/check_clang_tidy.py

def __init__(self, args, extra_args):
     self.clang_tidy_extra_args = extra_args
     if '--' in extra_args:
       i = self.clang_tidy_extra_args.index('--')
       self.clang_extra_args = self.clang_tidy_extra_args[i + 1:]
       self.clang_tidy_extra_args = self.clang_tidy_extra_args[:i]
 
     # If the test does not specify a config style, force an empty one; otherwise
     # auto-detection logic can discover a ".clang-tidy" file that is not related to
     # the test.
-    if not any(
-        [arg.startswith('-config=') for arg in self.clang_tidy_extra_args]):
-      self.clang_tidy_extra_args.append('-config={}')
+    if not any([
+        re.match('^-?-config(-file)?=', arg)
+        for arg in self.clang_tidy_extra_args]):
+      self.clang_tidy_extra_args.append('--config={}')
 
     if extension in ['.m', '.mm']:
       self.clang_extra_args = ['-fobjc-abi-version=2', '-fobjc-arc', '-fblocks'] + \
           self.clang_extra_args
 
     if extension in ['.cpp', '.hpp', '.mm']:
       self.clang_extra_args.append('-std=' + self.std)
 

clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation-cfgfile.cpp

-// RUN: clang-tidy %s --config-file=%S/Inputs/identifier-naming/hungarian-notation1/.clang-tidy 2>&1 \
-// RUN:   | FileCheck -check-prefixes=CHECK-MESSAGES %s
+// RUN: %check_clang_tidy %s readability-identifier-naming %t -- --config-file=%S/Inputs/identifier-naming/hungarian-notation2/.clang-tidy
 
 // clang-format off
 typedef signed char         int8_t;     // NOLINT
 typedef short               int16_t;    // NOLINT
 typedef long                int32_t;    // NOLINT
 typedef long long           int64_t;    // NOLINT
 typedef unsigned char       uint8_t;    // NOLINT
 typedef unsigned short      uint16_t;   // NOLINT

clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming-hungarian-notation.cpp

-// RUN: clang-tidy %s --config-file=%S/Inputs/identifier-naming/hungarian-notation2/.clang-tidy 2>&1 \
-// RUN:   | FileCheck -check-prefixes=CHECK-MESSAGES %s
+// RUN: %check_clang_tidy %s readability-identifier-naming %t -- --config-file=%S/Inputs/identifier-naming/hungarian-notation1/.clang-tidy
 
 // clang-format off
 typedef signed char         int8_t;     // NOLINT
 typedef short               int16_t;    // NOLINT
 typedef long                int32_t;    // NOLINT
 typedef long long           int64_t;    // NOLINT
 typedef unsigned char       uint8_t;    // NOLINT
 typedef unsigned short      uint16_t;   // NOLINT