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

Add unit tests and fix for #2794 , add unit tests for #2773 (backport #2792) #2834

Merged
merged 4 commits into from
Nov 10, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 8, 2022

This is an automatic backport of pull request #2792 done by Mergify.
Cherry-pick of f24a624 has failed:

On branch mergify/bp/3.5.x/pr-2792
Your branch is up to date with 'origin/3.5.x'.

You are currently cherry-picking commit f24a6248.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/test/scala/chiselTests/CompatibilityInteroperabilitySpec.scala

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/main/scala/chisel3/Module.scala

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

)

(cherry picked from commit f24a624)

# Conflicts:
#	core/src/main/scala/chisel3/Module.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Nov 8, 2022
@mwachs5
Copy link
Contributor

mwachs5 commented Nov 8, 2022

note that a lot of these tests need to be flipped to "should fail like X" instead of "should work" as master branch had different semantics on these than 3.5.x. Will work on fixing these up

@mwachs5
Copy link
Contributor

mwachs5 commented Nov 10, 2022

i think i now need a follow-up on the original to get rid of the comments about "these tests are supposed to fail on 3.5.x"

@mergify mergify bot merged commit 17c0499 into 3.5.x Nov 10, 2022
@mergify mergify bot deleted the mergify/bp/3.5.x/pr-2792 branch November 10, 2022 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants