Skip to content

[Test][Embedded] Make dependencies print compatible with lit shell #85881

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

Jump to bottom
Draft
ramonasuncion wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[Test][Embedded] Make dependencies print compatible with lit shell #85881

ramonasuncion wants to merge 4 commits into from
+29 −9

Conversation

@ramonasuncion
Copy link
Member

@ramonasuncion ramonasuncion commented Dec 6, 2025 •
edited
Loading

@ramonasuncion ramonasuncion marked this pull request as draft December 6, 2025 08:19
@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 6, 2025

Yeah, this is best I could do. I don't know why I thought diff -u would have been better. To even get it to work, you have to remove from ...macos.txt (what I'm using to test this on):

___divti3
___modti3
_memset

I'll have to recheck what I did for other test because some did work.

@ramonasuncion ramonasuncion marked this pull request as ready for review December 6, 2025 08:36
@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 6, 2025

@swift-ci please smoke test

ramonasuncion
ramonasuncion commented Dec 7, 2025
View reviewed changes
test/embedded/dependencies-print.swift Outdated
// Fail if there is any entry in actual-dependencies.txt that's not in allowed-dependencies.txt
// RUN: test -z "`comm -13 %t/allowed-dependencies.txt %t/actual-dependencies.txt`"

// RUN: %if target-os-linux-gnu %{ comm -13 %t/allowed-dependencies_linux.txt %t/actual-dependencies.txt > %t/extra.txt && test ! -s %t/extra.txt %} %else %{ comm -13 %t/allowed-dependencies_macos.txt %t/actual-dependencies.txt > %t/extra.txt && test ! -s %t/extra.txt %}
Copy link
Member Author

@ramonasuncion ramonasuncion Dec 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh... I'm not sorting before using comm. The manual says "compare two sorted files line by line," I'm only sorting actual-dependencies.txt, not allowed-dependencies.txt

@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 7, 2025

@swift-ci please smoke test linux platform

@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 7, 2025 •
edited
Loading 

[2025-12-07T09:56:53.714Z] ******************** TEST 'Swift(linux-x86_64) :: embedded/dependencies-print.swift' FAILED ********************
[2025-12-07T09:56:53.714Z] Exit Code: 1
[2025-12-07T09:56:53.714Z] 
[2025-12-07T09:56:53.714Z] Command Output (stdout):
[2025-12-07T09:56:53.714Z] --
[2025-12-07T09:56:53.714Z] __stack_chk_fail
[2025-12-07T09:56:53.714Z] memmove
[2025-12-07T09:56:53.714Z] putchar
[2025-12-07T09:56:53.714Z] 
[2025-12-07T09:56:53.714Z] --

Back to the Docker container.

@ramonasuncion ramonasuncion marked this pull request as draft December 7, 2025 15:23
@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 7, 2025

@swift-ci please smoke test

@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 8, 2025

@swift-ci please smoke test macos platform

@ramonasuncion
Copy link
Member Author

ramonasuncion commented Dec 8, 2025

@swift-ci please smoke test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@ramonasuncion