Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

Ioan-Cristian
Copy link
Contributor

Pull Request Overview

This pull request addresses the issue #3692 .

Testing Strategy

This pull request has not been tested on any hardware yet

TODO or Help Wanted

I need testing on actual hardware to see if everything works as expected.

Documentation Updated

No updates required.

Formatting

  • Ran make prepush.

@github-actions github-actions bot added chips/sam4l Change pertains to the SAM4L MCU. chips/nrf Change pertains to the nRF5x family of MCUs. HIL This affects a Tock HIL interface. WG-OpenTitan In the purview of the OpenTitan working group. chips/stm32 Change pertains to the stm32 family of MCUSs labels Sep 29, 2023
bradjc
bradjc previously approved these changes Oct 4, 2023
@bradjc bradjc added the last-call Final review period for a pull request. label Oct 4, 2023
@twilfredo
Copy link
Contributor

might be a good idea to rebase and squish the last 3 commits into a single one. Looks like there's some overlap + a merge commit?

@Ioan-Cristian Ioan-Cristian force-pushed the flash-error-improvement branch from df3e3c6 to 8b4fce4 Compare October 9, 2023 07:13
@github-actions github-actions bot added the WG-Network In the purview of the Network working group. label Oct 9, 2023
@Ioan-Cristian
Copy link
Contributor Author

might be a good idea to rebase and squish the last 3 commits into a single one. Looks like there's some overlap + a merge commit?

Done.

@bradjc bradjc added this pull request to the merge queue Oct 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Oct 9, 2023
@github-actions github-actions bot removed the WG-Network In the purview of the Network working group. label Oct 10, 2023
@Ioan-Cristian Ioan-Cristian force-pushed the flash-error-improvement branch from 4f86769 to a62593e Compare October 10, 2023 10:17
@Ioan-Cristian
Copy link
Contributor Author

Rebased.

@bradjc bradjc added this pull request to the merge queue Oct 10, 2023
Merged via the queue into tock:master with commit deb898d Oct 10, 2023
Comment on lines -20 to -36
fn tickv_append_key() {
debug!("start TicKV append key test...");

unsafe {
let tickv = TICKV.unwrap();
let sip_hasher = SIPHASH.unwrap();

let key_input = static_init!(
[u8; 16],
[
0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, 0x12, 0x34, 0x56, 0x78, 0x9A,
0xBC, 0xDE, 0xF0
]
);
let key = static_init!([u8; 8], [0; 8]);
let value = static_init!([u8; 3], [0x10, 0x20, 0x30]);
let ret = static_init!([u8; 4], [0; 4]);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you remove test cases? Does this PR cause a regression but instead of fixing it you removed the tests?

Copy link
Contributor Author

@Ioan-Cristian Ioan-Cristian Dec 8, 2023

Choose a reason for hiding this comment

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

Pretty sure I didn't remove them. @bradjc may confirm this.

I didn't perform any tests on actual hardware so I could not be aware of any regression tests. Initially, I only changed the signature of flash methods and a small detail design implementation. However, the detail design was rejected by @bradjc , so there was not any change in code logic.

The sole explanation that I have: it looks like my pull request was merged on 10th October, while yours on 9th October, so your work was overwritten by my pull request. Locally, I still have tickv_test.rs file that you removed. I apologize for my mistake!

Copy link
Contributor

Choose a reason for hiding this comment

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

The sole explanation that I have: it looks like my pull request was merged on 10th October, while yours on 9th October, so your work was overwritten by my pull request. Locally, I still have tickv_test.rs file that you removed. I apologize for my mistake!

Urgh. I would hope that would have been caught by review to ensure we don't get nasty merge conflicts like this.

That's ok! I was just confused why test cases are being removed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chips/nrf Change pertains to the nRF5x family of MCUs. chips/sam4l Change pertains to the SAM4L MCU. chips/stm32 Change pertains to the stm32 family of MCUSs HIL This affects a Tock HIL interface. last-call Final review period for a pull request. WG-OpenTitan In the purview of the OpenTitan working group.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants