[clang-tidy] Actually fix header guard handling in scripts

llvm-svn: 318971

2 files changed, 6 insertions, 3 deletions

diff --git a/clang-tools-extra/clang-tidy/add_new_check.py b/clang-tools-extra/clang-tidy/add_new_check.py
index c7d212e22cb..722e6fb28cd 100755
--- a/clang-tools-extra/clang-tidy/add_new_check.py
+++ b/clang-tools-extra/clang-tidy/add_new_check.py
@@ -51,7 +51,7 @@ def write_header(module_path, module, check_name, check_name_camel):
   print('Creating %s...' % filename)
   with open(filename, 'wb') as f:
     header_guard = ('LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_' + module.upper() + '_'
-                    + check_name.upper().replace('-', '_') + '_H')
+                    + check_name_camel.upper() + '_H')
     f.write('//===--- ')
     f.write(os.path.basename(filename))
     f.write(' - clang-tidy')
diff --git a/clang-tools-extra/clang-tidy/rename_check.py b/clang-tools-extra/clang-tidy/rename_check.py
index 54fba8038d8..194afc949f1 100755
--- a/clang-tools-extra/clang-tidy/rename_check.py
+++ b/clang-tools-extra/clang-tidy/rename_check.py
@@ -196,7 +196,9 @@ def main():
 
   clang_tidy_path = os.path.dirname(__file__)
 
-  header_guard_old = (old_module + '_' + check_name_camel).upper()
+  header_guard_variants = [
+      (old_module + '_' + new_check_name_camel).upper(),
+      args.old_check_name.replace('-', '_').upper()]
   header_guard_new = (new_module + '_' + new_check_name_camel).upper()
 
   old_module_path = os.path.join(clang_tidy_path, old_module)
@@ -225,7 +227,8 @@ def main():
                   generateCommentLineHeader(filename))
     replaceInFile(filename, generateCommentLineSource(originalName),
                   generateCommentLineSource(filename))
-    replaceInFile(filename, header_guard_old, header_guard_new)
+    for header_guard in header_guard_variants:
+      replaceInFile(filename, header_guard, header_guard_new)
 
     if args.new_check_name + '.rst' in filename:
       replaceInFile(