Skip to content

Commit

Permalink
Rename SmartPointerExpectations to SaferCPPExpectations
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=280812

Reviewed by Ryosuke Niwa.

Follow new naming convention.

* Source/WebCore/SaferCPPExpectations/NoUncheckedPtrMemberCheckerExpectations: Renamed from Source/WebCore/SmartPointerExpectations/NoUncheckedPtrMemberCheckerExpectations.
* Source/WebCore/SaferCPPExpectations/NoUncountedMemberCheckerExpectations: Renamed from Source/WebCore/SmartPointerExpectations/NoUncountedMemberCheckerExpectations.
* Source/WebCore/SaferCPPExpectations/RefCntblBaseVirtualDtorExpectations: Renamed from Source/WebCore/SmartPointerExpectations/RefCntblBaseVirtualDtorExpectations.
* Source/WebCore/SaferCPPExpectations/UncountedCallArgsCheckerExpectations: Renamed from Source/WebCore/SmartPointerExpectations/UncountedCallArgsCheckerExpectations.
* Source/WebCore/SaferCPPExpectations/UncountedLocalVarsCheckerExpectations: Renamed from Source/WebCore/SmartPointerExpectations/UncountedLocalVarsCheckerExpectations.
* Source/WebKit/SaferCPPExpectations/NoUncheckedPtrMemberCheckerExpectations: Renamed from Source/WebKit/SmartPointerExpectations/NoUncheckedPtrMemberCheckerExpectations.
* Source/WebKit/SaferCPPExpectations/NoUncountedMemberCheckerExpectations: Renamed from Source/WebKit/SmartPointerExpectations/NoUncountedMemberCheckerExpectations.
* Source/WebKit/SaferCPPExpectations/RefCntblBaseVirtualDtorExpectations: Renamed from Source/WebKit/SmartPointerExpectations/RefCntblBaseVirtualDtorExpectations.
* Source/WebKit/SaferCPPExpectations/UncountedCallArgsCheckerExpectations: Renamed from Source/WebKit/SmartPointerExpectations/UncountedCallArgsCheckerExpectations.
* Source/WebKit/SaferCPPExpectations/UncountedLocalVarsCheckerExpectations: Renamed from Source/WebKit/SmartPointerExpectations/UncountedLocalVarsCheckerExpectations.
* Tools/Scripts/compare-static-analysis-results:
(compare_project_results_to_expectations):
* Tools/Scripts/update-safer-cpp-expectations:
(parser):

Canonical link: https://commits.webkit.org/284601@main
  • Loading branch information
briannafan committed Oct 3, 2024
1 parent a3d73e2 commit 85240f4
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Tools/Scripts/compare-static-analysis-results
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def compare_project_results_to_expectations(args, new_path, project):
# Compare the list of dirty files to the expectations list of files
for checker in CHECKERS:
# Get unexpected clean and buggy files per checker
buggy_files, clean_files = find_diff(args, os.path.abspath(f'Source/{project}/SmartPointerExpectations/{checker}Expectations'), f'{new_path}/{project}/{checker}Files')
buggy_files, clean_files = find_diff(args, os.path.abspath(f'Source/{project}/SaferCPPExpectations/{checker}Expectations'), f'{new_path}/{project}/{checker}Files')
unexpected_clean_files.update(clean_files)
unexpected_buggy_files.update(buggy_files)

Expand Down
8 changes: 4 additions & 4 deletions Tools/Scripts/update-safer-cpp-expectations
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import os
import argparse

EXPECTATIONS_PATH = '../../Source/{project}/SmartPointerExpectations/{checker_type}Expectations'
EXPECTATIONS_PATH = '../../Source/{project}/SaferCPPExpectations/{checker_type}Expectations'
CHECKERS = ['NoUncountedMemberChecker', 'NoUncheckedPtrMemberChecker', 'RefCntblBaseVirtualDtor', 'UncountedCallArgsChecker', 'UncountedLocalVarsChecker']
PROJECTS = ['WebCore', 'WebKit']

Expand All @@ -35,13 +35,13 @@ def parser():
'--add-expected-failures', '-a',
dest='results_to_add',
default=None,
help='Path to unexpected results file. Adds unexpected failures to the expectations files in SmartPointerExpectations.'
help='Path to unexpected results file. Adds unexpected failures to the expectations files in SaferCPPExpectations.'
)
parser.add_argument(
'--remove-expected-failures', '-r',
dest='results_to_remove',
default=None,
help='Path to unexpected results file. Removes unexpected failures from the expectations files in SmartPointerExpectations.'
help='Path to unexpected results file. Removes unexpected failures from the expectations files in SaferCPPExpectations.'
)
parser.add_argument(
'--project', '-p',
Expand Down Expand Up @@ -102,7 +102,7 @@ def update_expectations(unexpected_results, project, type):


'''
This currently checks against the files in your local checkout at SmartPointerExpectations.
This currently checks against the files in your local checkout at SaferCPPExpectations.
Ensure that it is up-to-date before using this script.
'''
def is_expected_file(expected_file):
Expand Down

0 comments on commit 85240f4

Please sign in to comment.