Skip to content

Commit

Permalink
Merge from 'master' to 'sycl-web' (intel#79)
Browse files Browse the repository at this point in the history
  CONFLICT (content): Merge conflict in clang/test/Driver/openmp-offload.c
  • Loading branch information
sndmitriev committed Oct 12, 2019
2 parents b36dc10 + 0bb06f6 commit 8fdbbc4
Show file tree
Hide file tree
Showing 754 changed files with 9,810 additions and 2,765 deletions.
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-tidy/add_new_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def add_release_notes(module_path, module, check_name):
# Adds a test for the check.
def write_test(module_path, module, check_name, test_extension):
check_name_dashes = module + '-' + check_name
filename = os.path.normpath(os.path.join(module_path, '../../test/clang-tidy',
filename = os.path.normpath(os.path.join(module_path, '../../test/clang-tidy/checkers',
check_name_dashes + '.' + test_extension))
print('Creating %s...' % filename)
with open(filename, 'w') as f:
Expand Down
Loading

0 comments on commit 8fdbbc4

Please sign in to comment.