Skip to content

[build-webkit-org] Use filter-test-logs and remove superfluous scripts #29718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2024
Merged

[build-webkit-org] Use filter-test-logs and remove superfluous scripts #29718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tools/CISupport/build-webkit-org/steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ def run(self):
self.command += ['--test-writer=ruby']

self.appendCustomBuildFlags(platform, self.getProperty('fullPlatform'))
self.command = ['/bin/sh', '-c', ' '.join(self.command) + ' 2>&1 | python3 Tools/Scripts/filter-jsc-tests']
self.command = ['/bin/sh', '-c', ' '.join(self.command) + ' 2>&1 | python3 Tools/Scripts/filter-test-logs jsc']

steps_to_add = [
GenerateS3URL(
Expand Down Expand Up @@ -1632,7 +1632,7 @@ def run(self):
build_command = f"Tools/Scripts/build-and-analyze --output-dir {os.path.join(self.getProperty('builddir'), f'build/{SCAN_BUILD_OUTPUT_DIR}')} "
build_command += f"--only-smart-pointers --analyzer-path={os.path.join(self.getProperty('builddir'), 'llvm-project/build/bin/clang')} "
build_command += '--scan-build-path=../llvm-project/clang/tools/scan-build/bin/scan-build --sdkroot=macosx --preprocessor-additions=CLANG_WEBKIT_BRANCH=1 '
build_command += '2>&1 | python3 Tools/Scripts/filter-static-analyzer'
build_command += '2>&1 | python3 Tools/Scripts/filter-test-logs scan-build'

for command in [
self.shell_command(f"/bin/rm -rf {os.path.join(self.getProperty('builddir'), f'build/{SCAN_BUILD_OUTPUT_DIR}')}"),
Expand Down
6 changes: 3 additions & 3 deletions Tools/CISupport/build-webkit-org/steps_unittest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ def test_success(self):
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
command=['/bin/sh', '-c', ' '.join(command) + ' 2>&1 | python3 Tools/Scripts/filter-jsc-tests'],
command=['/bin/sh', '-c', ' '.join(command) + ' 2>&1 | python3 Tools/Scripts/filter-test-logs jsc'],
logfiles={'json': self.jsonFileName},
env={'RESULTS_SERVER_API_KEY': 'test-api-key'},
timeout=72000,
Expand All @@ -1117,7 +1117,7 @@ def test_failure(self):
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
command=['/bin/sh', '-c', ' '.join(command) + ' 2>&1 | python3 Tools/Scripts/filter-jsc-tests'],
command=['/bin/sh', '-c', ' '.join(command) + ' 2>&1 | python3 Tools/Scripts/filter-test-logs jsc'],
logfiles={'json': self.jsonFileName},
env={'RESULTS_SERVER_API_KEY': 'test-api-key'},
timeout=72000,
Expand Down Expand Up @@ -1842,7 +1842,7 @@ def test_skipped(self):

class TestScanBuildSmartPointer(BuildStepMixinAdditions, unittest.TestCase):
WORK_DIR = 'wkdir'
EXPECTED_BUILD_COMMAND = ['/bin/sh', '-c', f'Tools/Scripts/build-and-analyze --output-dir wkdir/build/{SCAN_BUILD_OUTPUT_DIR} --only-smart-pointers --analyzer-path=wkdir/llvm-project/build/bin/clang --scan-build-path=../llvm-project/clang/tools/scan-build/bin/scan-build --sdkroot=macosx --preprocessor-additions=CLANG_WEBKIT_BRANCH=1 2>&1 | python3 Tools/Scripts/filter-static-analyzer']
EXPECTED_BUILD_COMMAND = ['/bin/sh', '-c', f'Tools/Scripts/build-and-analyze --output-dir wkdir/build/{SCAN_BUILD_OUTPUT_DIR} --only-smart-pointers --analyzer-path=wkdir/llvm-project/build/bin/clang --scan-build-path=../llvm-project/clang/tools/scan-build/bin/scan-build --sdkroot=macosx --preprocessor-additions=CLANG_WEBKIT_BRANCH=1 2>&1 | python3 Tools/Scripts/filter-test-logs scan-build']

def setUp(self):
return self.setUpBuildStep()
Expand Down