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

Test paths fixes #7583

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Test paths fixes #7583

merged 1 commit into from
Dec 12, 2024

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Dec 12, 2024

  1. Load assets from the bundle on Mac.
  2. In timedemo_test, load MPQs before overriding pref path, so that they can also be loaded from the user/system location.
  3. Fix various double directory separators ("build//assets" etc).

Also fixes running drlg test directly (e.g. build/drlg_l1_test, as opposed to via ctest) -- the latter runs an individual process for each test but in the former we weren't resetting LevelSeeds so when running multiple tests from the same process the later tests were failing.

@glebm glebm enabled auto-merge (rebase) December 12, 2024 11:45
@glebm glebm marked this pull request as draft December 12, 2024 11:54
auto-merge was automatically disabled December 12, 2024 11:54

Pull request was converted to draft

@AJenbo
Copy link
Member

AJenbo commented Dec 12, 2024

We should also fix the modern Mac build so that the tests builds are being done for iOS and macOS :D

AJenbo
AJenbo previously approved these changes Dec 12, 2024
@glebm glebm marked this pull request as ready for review December 12, 2024 17:36
@glebm glebm enabled auto-merge (rebase) December 12, 2024 17:36
@glebm
Copy link
Collaborator Author

glebm commented Dec 12, 2024

Yep, would be good to do once macOS and iOS CI is running again

1. Load assets from the bundle on Mac.
2. In timedemo_test, load MPQs before overriding pref path,
   so that they can also be loaded from the user/system location.
3. Fix various double directory separators ("build//assets" etc).
@AJenbo AJenbo disabled auto-merge December 12, 2024 20:40
@AJenbo AJenbo merged commit 940ce3f into diasurgical:master Dec 12, 2024
21 of 23 checks passed
@AJenbo
Copy link
Member

AJenbo commented Dec 12, 2024

This should fix it so that auto merge isn't just annoying anymore :P

#7584

@glebm glebm deleted the test-paths branch December 12, 2024 20:53
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