Skip to content

[5.8] Relax FileCheck directives for skip_clean_llbuild.test #66064

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.

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

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented May 22, 2023

This is needed short term to allow the test to pass when running on Python 3.11 and later and avoid errors like

<stdin>:44:1: note: non-matching line after previous match is here
<string>:1: DeprecationWarning: 'pipes' is deprecated and slated for removal in Python 3.13
^

Long term we want to replace uses of the obsolete pipes.quotes function with shlex.quotes.

Piggyback a change in round-trip-syntax-test from #63237 to avoid Python linting errors.

Addresses rdar://109664710

(cherry picked from commit 1534925,
#66062)

This is needed short term to allow the test to pass when running on
Python 3.11 and later and avoid errors like

```
<stdin>:44:1: note: non-matching line after previous match is here
<string>:1: DeprecationWarning: 'pipes' is deprecated and slated for removal in Python 3.13
^
```

Long term we want to replace uses of the obsolete `pipes.quotes`
function with `shlex.quotes`.

Addresses rdar://109664710

(cherry picked from commit 1534925,
 swiftlang#66062)
@edymtt edymtt requested a review from a team as a code owner May 22, 2023 19:16
@edymtt
Copy link
Contributor Author

edymtt commented May 22, 2023

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented May 22, 2023

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented May 22, 2023

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented May 23, 2023

The Apple Silicon runs fails with a Python lint error

******************** TEST 'Swift(macosx-arm64) :: Python/python_lint.swift' FAILED ********************
Script:
--
: 'RUN: at line 8';   /Applications/Xcode.app/Contents/Developer/usr/bin/python3 /Users/ec2-user/jenkins/workspace/swift-pr-arm64-macos/branch-release/5.8/swift/utils/python_lint.py
--
Exit Code: 1

Command Output (stdout):
--
./utils/round-trip-syntax-test:77:39: E741 ambiguous variable name 'l'

--

Looks like I may need to cherry-pick #63237 to make that pass

- lowercase-l trips some python lint configurations

(cherry picked from commit 36d230e,
 swiftlang#63237)
@edymtt
Copy link
Contributor Author

edymtt commented May 23, 2023

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented May 23, 2023

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented May 23, 2023

@swift-ci please build toolchain

@edymtt
Copy link
Contributor Author

edymtt commented May 24, 2023

skip_clean_llbuild is now passing, and we are failing running tests for llbuild

...
PASS: Swift-validation(macosx-arm64) :: BuildSystem/skip_clean_llbuild.test (8630 of 15728)
...
Failed Tests (1):
  llbuild :: SwiftBuildTool/swift-compiler-whole-module-optimization.swift-build

@hamishknight
Copy link
Contributor

swiftlang/swift-llbuild#879

@swift-ci please test Apple Silicon

@shahmishal shahmishal merged commit 85f8090 into swiftlang:release/5.8 May 30, 2023
@edymtt edymtt deleted the edymtt/relax-skip_clean_llbuild.test-5.8 branch May 31, 2023 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants