Skip to content
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

test: Remove duplicate test for -static-executable #34275

Merged
merged 1 commit into from
Oct 12, 2020

Conversation

spevans
Copy link
Contributor

@spevans spevans commented Oct 12, 2020

  • test/Driver/static-executable-linux.swift is duplicated by
    test/Driver/static-executable.swift

  • Additionally, test/Driver/static-executable-linux.swift uses 'FILE'
    instead of 'ELF-NOT' to detect if the executable is statically linked
    and this breaks on Centos7.

@spevans
Copy link
Contributor Author

spevans commented Oct 12, 2020

@swift-ci test

@spevans
Copy link
Contributor Author

spevans commented Oct 12, 2020

cc @brentdax

- test/Driver/static-executable-linux.swift is duplicated by
  test/Driver/static-executable.swift so remove it.

- Additionally, test/Driver/static-executable-linux.swift uses 'file'
  instead of 'lvm-readelf' to detect if the executable is statically
  linked and this breaks on Centos7.
@spevans
Copy link
Contributor Author

spevans commented Oct 12, 2020

@swift-ci test

@beccadax
Copy link
Contributor

I'm going to force-merge this early—it's passed on Linux and should have even less effect on macOS, and it should clear at least one bot.

@beccadax beccadax merged commit 04606d5 into swiftlang:main Oct 12, 2020
@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 8c3081c

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.

3 participants