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 testCheats when running standalone #1737

Merged
merged 5 commits into from
Feb 25, 2025

Conversation

Flamefire
Copy link
Member

The test creates a desktop instance that requires access to the VideoDriver and potentially resources (graphics) which are not available at this point. This leads to failures when the test is not started after a test installing a test-videodriver in the same process.

Manually create the required instances without that desktop.

Copy link
Member

@Flow86 Flow86 left a comment

Choose a reason for hiding this comment

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

needs rebase

@Flamefire
Copy link
Member Author

Resolved the conflict.

@Flamefire Flamefire requested a review from Flow86 February 25, 2025 11:17
@Flamefire Flamefire enabled auto-merge (rebase) February 25, 2025 11:17
@Flamefire Flamefire force-pushed the cheat-test branch 4 times, most recently from 1e09468 to c521bd9 Compare February 25, 2025 13:14
The test creates a desktop instance that requires access to the
VideoDriver and potentially resources (graphics) which are not available
at this point. This leads to failures when the test is not started after
a test installing a test-videodriver in the same process.

Manually create the required instances without that desktop.
Avoid conflicts and polution
They might contain stale objects leading to
```
/usr/bin/ld: CMakeFiles/s25client.dir/s25client.cpp.o: in function `(anonymous namespace)::handleException(void*) [clone .constprop.0]':
s25client.cpp:(.text+0x18b2): undefined reference to `DebugInfo::SendStackTrace(std::vector<void*, std::allocator<void*> > const&)'
```
@Flamefire
Copy link
Member Author

@Flow86 Again having the issue with undefined references to symbols removed earlier. Not sure why this keeps popping up.

/usr/bin/ld: CMakeFiles/s25client.dir/s25client.cpp.o: in function `(anonymous namespace)::handleException(void*) [clone .constprop.0]':
s25client.cpp:(.text+0x18b2): undefined reference to `DebugInfo::SendStackTrace(std::vector<void*, std::allocator<void*> > const&)'

I added a commit to make it at least use architecture dependent folders as maybe it was mixing up the builds
But I guess the real reason is that the obj files are kept and git restore-mtime -c might not correspond well enough with the date on the server leading t skipped rebuilds.
I guess the rm -r CMakeFiles was indented to avoid this but there are more such folders in subfolders. I added a commit to delete them too.
I guess that increases the build time as everything will be rebuild but better than building wrong combinations and ccache should be helpful enough.
Or is there another solution?

@Flamefire Flamefire merged commit c8cf430 into Return-To-The-Roots:master Feb 25, 2025
21 checks passed
@Flamefire Flamefire deleted the cheat-test branch February 25, 2025 16:16
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