-
Notifications
You must be signed in to change notification settings - Fork 492
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
ENH: Streamline test execution setting launch environment #1168
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jcfr
force-pushed
the
set-test-launch-environment
branch
5 times, most recently
from
January 13, 2024 06:44
a107804
to
9c609db
Compare
Update "simple_test" and "simple_test_with_data" macros settings the `ENVIRONMENT` test property using `CTK_TEST_LAUNCH_BUILD_ENVIRONMENT` variable. Set `CTK_TEST_LAUNCH_BUILD_ENVIRONMENT` variable defines the environment variables `PATH`, `LD_LIBRARY_PATH` and/or `DYLD_LIBRARY_PATH` based on the list of paths and library paths associated with dependencies. This includes Qt and any enabled external projects. To streamline the process of gathering external project-specific "library paths" and "paths", these are now individually defined within each external project and linked to a label associated with the corresponding `mark_as_superbuild()` call.
jcfr
force-pushed
the
set-test-launch-environment
branch
from
January 13, 2024 06:54
9c609db
to
f8b09ce
Compare
jcfr
force-pushed
the
set-test-launch-environment
branch
from
January 13, 2024 08:45
5f13254
to
a91ebcf
Compare
jcfr
added a commit
to jcfr/CTK
that referenced
this pull request
Jan 13, 2024
In commit 0f5da46 ("ENH: Update ctkDICOMTester to lookup DCMTK executables in build tree", 2024-01-12), the directory for searching DCMTK binaries was changed from an install tree to a build tree. While this change was effective for single config builds, it failed in the case of multi-config builds where the exectuables are generated in sub-directories like "Release", "RelWithDebInfo", "MinSizeRel", or "Debug". Following commit c1d55a1 ("ENH: Streamline test execution setting launch environment (commontk#1168)," 2024-01-13), tests began executing with an updated PATH environment variable. To address the issue, we now expect DCMTK binaries to be automatically located in the PATH.
jcfr
added a commit
to jcfr/CTK
that referenced
this pull request
Jan 13, 2024
…build tree In commit 2583a4e ("Remove empty build command and set install command empty.", 2014-11-04), the systematic installation of DCMTK during CTK superbuild was disabled. To support looking up binaries in the build tree, commit 0f5da46 ("ENH: Update ctkDICOMTester to lookup DCMTK executables in build tree", 2024-01-12), the directory for searching DCMTK binaries was changed from an install tree to a build tree. While this change was effective for single config builds, it failed in the case of multi-config builds where the exectuables are generated in sub-directories like "Release", "RelWithDebInfo", "MinSizeRel", or "Debug". Following commit c1d55a1 ("ENH: Streamline test execution setting launch environment (commontk#1168)," 2024-01-13), tests began executing with an updated PATH environment variable. To address the issue, we now expect DCMTK binaries to be automatically located in the PATH.
jcfr
added a commit
that referenced
this pull request
Jan 13, 2024
…build tree In commit 2583a4e ("Remove empty build command and set install command empty.", 2014-11-04), the systematic installation of DCMTK during CTK superbuild was disabled. To support looking up binaries in the build tree, commit 0f5da46 ("ENH: Update ctkDICOMTester to lookup DCMTK executables in build tree", 2024-01-12), the directory for searching DCMTK binaries was changed from an install tree to a build tree. While this change was effective for single config builds, it failed in the case of multi-config builds where the exectuables are generated in sub-directories like "Release", "RelWithDebInfo", "MinSizeRel", or "Debug". Following commit c1d55a1 ("ENH: Streamline test execution setting launch environment (#1168)," 2024-01-13), tests began executing with an updated PATH environment variable. To address the issue, we now expect DCMTK binaries to be automatically located in the PATH.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update "simple_test" and "simple_test_with_data" macros by setting the
ENVIRONMENT_MODIFICATION
test property with theCTK_TEST_LAUNCH_BUILD_ENVIRONMENT_MODIFICATION
variable.The
CTK_TEST_LAUNCH_BUILD_ENVIRONMENT_MODIFICATION
variable list the environment modifications for each environment variablesPATH
,LD_LIBRARY_PATH
and/orDYLD_LIBRARY_PATH
based on the list of paths and library paths associated with dependencies. This includes Qt and any enabled external projects.To streamline the process of gathering external project-specific "library paths" and "paths", these are now individually defined within each external project and linked to a label associated with the corresponding
mark_as_superbuild()
call.Related:
Prior attempt at setting the
ENVIRONMENT
test property failed on windows as there was no way of defining thePATH
variable. The use of;
(or even the$<SEMICOLON>
generator expression) did not allow to setPATH
with multiple values.