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

Let compiletest recognize gdb 10.x #71428

Merged
merged 2 commits into from
Apr 24, 2020
Merged

Conversation

tromey
Copy link
Contributor

@tromey tromey commented Apr 22, 2020

git gdb has moved to version 10. My build prints this as its
--version:

GNU gdb (GDB) 10.0.50.20200420-git

Unfortunately this conflicts with this comment in compiletest:

// We limit major to 1 digit, otherwise, on openSUSE, we parse the openSUSE version

This patch changes the version parsing to follow the GNU coding
standard, which accounts for both the openSUSE case as well as
handling gdb 10.

My debuginfo test run now says:

NOTE: compiletest thinks it is using GDB with native rust support
NOTE: compiletest thinks it is using GDB version 10000050

... where previously it failed to find that gdb 10 had rust support.

git gdb has moved to version 10.  My build prints this as its
--version:

    GNU gdb (GDB) 10.0.50.20200420-git

Unfortunately this conflicts with this comment in compiletest:

    // We limit major to 1 digit, otherwise, on openSUSE, we parse the openSUSE version

This patch changes the version parsing to follow the GNU coding
standard, which accounts for both the openSUSE case as well as
handling gdb 10.

My debuginfo test run now says:

NOTE: compiletest thinks it is using GDB with native rust support
NOTE: compiletest thinks it is using GDB version 10000050

... where previously it failed to find that gdb 10 had rust support.
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 22, 2020
The compiletest version-parsing tests failed after the previous patch.
However, I don't believe these tests are correct, in that I don't
think RHEL or CentOS ever put the gdb version number into parentheses.
Instead they display like:

    GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-119.el7
@nikomatsakis
Copy link
Contributor

r=me once travis is happy

@bors delegate=tromey

@bors
Copy link
Contributor

bors commented Apr 22, 2020

✌️ @tromey can now approve this pull request

@nikomatsakis nikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2020
@tromey
Copy link
Contributor Author

tromey commented Apr 22, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Apr 22, 2020

📌 Commit 90b4a97 has been approved by tromey

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 22, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 23, 2020
Let compiletest recognize gdb 10.x

git gdb has moved to version 10.  My build prints this as its
--version:

    GNU gdb (GDB) 10.0.50.20200420-git

Unfortunately this conflicts with this comment in compiletest:

    // We limit major to 1 digit, otherwise, on openSUSE, we parse the openSUSE version

This patch changes the version parsing to follow the GNU coding
standard, which accounts for both the openSUSE case as well as
handling gdb 10.

My debuginfo test run now says:

NOTE: compiletest thinks it is using GDB with native rust support
NOTE: compiletest thinks it is using GDB version 10000050

... where previously it failed to find that gdb 10 had rust support.
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2020
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71235 (Tweak `'static` suggestion code)
 - rust-lang#71318 (miri-unleash tests: ensure they fire even with 'allow(const_err)')
 - rust-lang#71428 (Let compiletest recognize gdb 10.x)
 - rust-lang#71475 (Miri Frame: use mir::Location to represent position in function)
 - rust-lang#71476 (more compact way to adjust test sizes for Miri)

Failed merges:

r? @ghost
@bors bors merged commit 715948e into rust-lang:master Apr 24, 2020
@tromey tromey deleted the gdb-10-parsing branch April 24, 2020 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants