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

Fix CI for thumb* targets #232

Merged
merged 6 commits into from
Feb 25, 2018
Merged

Fix CI for thumb* targets #232

merged 6 commits into from
Feb 25, 2018

Conversation

paoloteti
Copy link
Contributor

Main fix is inside utest (implement Termination to avoid ICE) all the rest are minor fixes due to the new testcrate.

Thumb6m needs some extra fixes: some undefined reference and a panic raised removing assembly implementation not in the list.

Still allow failures on TravisCI and keep my utest fork for a while. Let's see if is stable.

1. Avoid undefined references as:
   undefined reference to `__modsi3'
   undefined reference to `__umodsi3'

2. We can't remove assembly implementations that are not in the list
Main fix is inside 'utest' all the rest are minor fixes due to the
new 'testcrate'.

Still allow failures on TravisCI for a while.
Copy link
Member

@alexcrichton alexcrichton left a comment

Choose a reason for hiding this comment

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

Thanks!

utest-macros = { git = "https://github.com/japaric/utest" }
test = { git = "https://github.com/paoloteti/utest", branch = "ci" }
utest-cortex-m-qemu = { default-features = false, git = "https://github.com/paoloteti/utest", branch = "ci" }
utest-macros = { git = "https://github.com/paoloteti/utest", branch = "ci" }
Copy link
Member

Choose a reason for hiding this comment

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

For tracking purposes, are the changes here available as upstream PRs perhaps?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes it is upstream now, I'll update the URL


[features]
c = ["compiler_builtins/c"]
mem = ["compiler_builtins/mem"]
mangled-names = ["compiler_builtins/mangled-names"]
Copy link
Member

Choose a reason for hiding this comment

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

Could this perhaps be turned on by default? I was hoping to keep cargo test working in the testcrate directory "mostly working by default" if possible

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean 'default = ["mangled-names"]' only ?

Copy link
Member

Choose a reason for hiding this comment

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

Indeed!

@@ -1,3 +1,5 @@
#![cfg_attr(feature = "no_std", no_std)]
Copy link
Member

Choose a reason for hiding this comment

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

Could this unconditionally be #![no_std]?

Copy link
Member

Choose a reason for hiding this comment

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

(or this entire file could be emptied)

@paoloteti
Copy link
Contributor Author

Recent rust-lang/rust PR 48143 broke again utest.

If accepted on utest upstream PR 2 will fix the issue, so let's wait.

@alexcrichton
Copy link
Member

Ok! Regardless though this all looks good to me, so let's land this and then we can edit .travis.yml to start blocking again in a follow-up?

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 25, 2018

📌 Commit 9e99aa2 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 25, 2018

⌛ Testing commit 9e99aa2 with merge cfecfa2...

bors added a commit that referenced this pull request Feb 25, 2018
Fix CI for thumb* targets

Main fix is inside `utest` (implement Termination to avoid ICE) all the rest are minor fixes due to the new `testcrate`.

Thumb6m needs some extra fixes: some undefined reference and a panic raised removing assembly implementation not in the list.

Still allow failures on TravisCI and keep my `utest` fork for a while. Let's see if is stable.
@bors
Copy link
Contributor

bors commented Feb 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing cfecfa2 to master...

@bors bors merged commit 9e99aa2 into rust-lang:master Feb 25, 2018
@paoloteti paoloteti deleted the fix-thumb-ci branch February 25, 2018 18:20
@paoloteti paoloteti restored the fix-thumb-ci branch March 3, 2018 16:05
@paoloteti paoloteti deleted the fix-thumb-ci branch March 3, 2018 16:08
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