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

interrupts.h in tests/host/common is empty #6217

Merged
merged 3 commits into from
Jun 22, 2019

Conversation

dok-net
Copy link
Contributor

@dok-net dok-net commented Jun 21, 2019

No description provided.

@d-a-v
Copy link
Collaborator

d-a-v commented Jun 21, 2019

xt_rsil() and xt_wsr_ps() are both emulated so the core file core/esp8266/interrupts.h should compile just fine in test/mock directories.

Well it is right this file is empty in test/host/common/, per this PR's title. I just removed it from my tree and run make CI in test/host and all seems fine. Can you try it ? Can we just remove it from the tree ?

@dok-net
Copy link
Contributor Author

dok-net commented Jun 21, 2019

@d-a-v If #6182 builds fine, I guess it's OK to remove it - does that mean the real interrupts.h gets used, which in turn is OK because xt_rsil() and friend are emulated elsewhere?

@dok-net dok-net closed this Jun 21, 2019
@dok-net dok-net reopened this Jun 21, 2019
(cherry picked from commit e37a3ef0b237b23c8cd0db8fa9c496ddcde9ce1b)
@d-a-v
Copy link
Collaborator

d-a-v commented Jun 21, 2019

the real interrupts.h gets used

yes

because xt_rsil() and friend are emulated elsewhere?

yes

@dok-net
Copy link
Contributor Author

dok-net commented Jun 21, 2019

@d-a-v #6182 passed all build tests, so it is as you said, removing the mock interrupts.h entirely is the easiest fix. I modified this PR to do exactly that.

@d-a-v
Copy link
Collaborator

d-a-v commented Jun 22, 2019

Did you remove the file in this PR?
It seems it is still there

@dok-net
Copy link
Contributor Author

dok-net commented Jun 22, 2019

I removed it, it's not in my working directory anymore, and the "Files changed" says "empty file removed".

@d-a-v d-a-v merged commit 653f58e into esp8266:master Jun 22, 2019
@dok-net dok-net deleted the bugfix/interruptsmock branch June 22, 2019 18:42
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.

2 participants