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

No testdata copy and circular symlink fix #4728

Merged
merged 12 commits into from
Apr 27, 2022

Conversation

daschuer
Copy link
Member

This PR removes the mixxx-testdata target that copies/symlinks the test data into the build directory.
Instead it makes use of the existing function that is looking up the source tree path form CMakeCache.
This replaces the hard coded paths in the test classes.

This also fixes a circular symlink that happens when changing from 2.3 to main reported here:
https://mixxx.zulipchat.com/#narrow/stream/247620-development-help/topic/Failing.20controller.20test

@JoergAtGithub
Copy link
Member

I tried this PR locally on Win7 VS2019 and it works flawless. But I got warnings at compile time:

  [265/537] Building CXX object CMakeFiles\mixxx-lib.dir\src\preferences\configobject.cpp.obj
C:\Users\Joerg\source\repos\JoergAtGithub\mixxx\src\preferences\configobject.cpp(329): warning C4661: 'QString ConfigObject<ConfigValueKbd>::computeResourcePath(void)': no suitable definition provided for explicit template instantiation request
  C:\Users\Joerg\source\repos\JoergAtGithub\mixxx\src\preferences/configobject.h(180): note: see declaration of 'ConfigObject<ConfigValueKbd>::computeResourcePath'
C:\Users\Joerg\source\repos\JoergAtGithub\mixxx\src\preferences\configobject.cpp(300): warning C4661: 'QString ConfigObject<ConfigValueKbd>::computeResourcePath(void)': no suitable definition provided for explicit template instantiation request
  C:\Users\Joerg\source\repos\JoergAtGithub\mixxx\src\preferences/configobject.h(180): note: see declaration of 'ConfigObject<ConfigValueKbd>::computeResourcePath'

.. to make msvc happy. The funktion is not used.
@daschuer
Copy link
Member Author

Please retry, the warning should be gone.

@JoergAtGithub
Copy link
Member

I confirm, the warning is gone!

@ronso0
Copy link
Member

ronso0 commented Apr 20, 2022

I'm going to ng through this commit by commit but it'll tkae some time since I'm nit familiar with the tests.

src/test/taglibtest.cpp Outdated Show resolved Hide resolved
src/preferences/configobject.h Show resolved Hide resolved
src/test/autodjprocessor_test.cpp Outdated Show resolved Hide resolved
src/test/mixxxtest.h Outdated Show resolved Hide resolved
src/test/mixxxtest.h Outdated Show resolved Hide resolved
@daschuer
Copy link
Member Author

Done.

Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

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

The type-safe return value improved the code considerably.

Please fix the remaining redundancy. My proposal was just a first idea.

src/test/mixxxtest.h Outdated Show resolved Hide resolved
@daschuer
Copy link
Member Author

Done

Copy link
Contributor

@uklotzde uklotzde left a comment

Choose a reason for hiding this comment

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

Thank you for simplifying the build and code! LGTM

@uklotzde uklotzde merged commit cfa7da5 into mixxxdj:main Apr 27, 2022
@daschuer daschuer deleted the mixxx-testdata branch May 4, 2022 09:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants