Skip to content

Move C++ code into cpp/ dir#941

Merged
rdmark merged 6 commits intodevelopfrom
rdmark-cpp-restructure
Oct 25, 2022
Merged

Move C++ code into cpp/ dir#941
rdmark merged 6 commits intodevelopfrom
rdmark-cpp-restructure

Conversation

@rdmark
Copy link
Copy Markdown
Member

@rdmark rdmark commented Oct 25, 2022

  • Moved C++ code to cpp/ from src/raspberrypi
  • Related updates to Makefile, easyinstall.sh, and the github build rules
  • Removed the native X68k C code in src/x68k from the repo (code has not been compiled for years and testing suggests that it's no longer compatible with RaSCSI reloaded)

@sonarqubecloud
Copy link
Copy Markdown

@rdmark rdmark requested a review from uweseimet October 25, 2022 17:40
@uweseimet
Copy link
Copy Markdown
Contributor

@rdmark Looks fine for me, but surprisingly on my machine a unit test fails, which does not fail with the develop branch:

[ RUN      ] RascsiImageTest.DeleteImage
rascsi_test: ./devices/storage_device.cpp:64: void StorageDevice::ReserveFile(const std::string &, int, int) const: Assertion `reserved_files.find(file) == reserved_files.end()' failed.
make: *** [Makefile:174: test] Aborted

Your changes are based on develop, aren't they?

@rdmark
Copy link
Copy Markdown
Member Author

rdmark commented Oct 25, 2022

@uweseimet Yes, this branch is based on the latest develop. It's odd that a UT would fail for you, I agree. There must be some assumption about the location of code somewhere, I suppose? I've been building the tests in my environments but it takes a long time, since I only have the Pi, and an emulated Linux environment. Both are quite slow.

@rdmark
Copy link
Copy Markdown
Member Author

rdmark commented Oct 25, 2022

In my x64 VM with Debian Sid bleeding edge I got 264/264 passing tests.

@rdmark rdmark marked this pull request as ready for review October 25, 2022 18:12
@uweseimet
Copy link
Copy Markdown
Contributor

@rdmark I am going to investigate now what's happening on my machine. Can you please wait with merging until I know more details? It might be required to change something in the offending test.

@uweseimet
Copy link
Copy Markdown
Contributor

@rdmark Very strange: When running the tests in my regular enviroment (last time I was using a different folder with a fresh checkout) everything is passing. The tests do no require any special setup, and I have no idea what caused them to fail.
Anyway, things appear to be fine now.

@uweseimet
Copy link
Copy Markdown
Contributor

@rdmark Do the tests in RASCS/test/robot still have any relevance?

@uweseimet uweseimet linked an issue Oct 25, 2022 that may be closed by this pull request
@rdmark
Copy link
Copy Markdown
Member Author

rdmark commented Oct 25, 2022

@rdmark Do the tests in RASCS/test/robot still have any relevance?

@uweseimet I believe these are the tests that run in @akuker's personal lab environment against real hardware

Perhaps we can move them into /hw/test/robot

@uweseimet
Copy link
Copy Markdown
Contributor

@rdmark We might address this in a separate step, depending on @akuker's feedback. I would appreciate the current changes to be merged soon, because otherwise it's inconvenient for me to continue with issue 663, which I need to update based on the changes of this PR.

@rdmark rdmark merged commit 08194af into develop Oct 25, 2022
@rdmark rdmark deleted the rdmark-cpp-restructure branch October 25, 2022 19:59
@rdmark
Copy link
Copy Markdown
Member Author

rdmark commented Oct 25, 2022

@uweseimet Agreed, there is no rush to clean this up in this PR. All the unit tests passed also on my RPi3+ w/ Bullseye so this is good to go.

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.

Restructure project folders to better accommodate (C++) unit tests

2 participants