BUG: Fix lookup of DCMTK binaries in multi-config build tree #1169
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
…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.
…ndows Follow-up on commit 2583a4e ("Remove empty build command and set install command empty.", 2014-11-04) which disabled the systematic installation of DCMTK during the CTK superbuild. This commit addresses the binary lookup issue for ctkDICOMApplicationTest1 on Windows by ensuring that all configuration sub-directories are considered during the lookup.
jcfr
force-pushed
the
fix-lookup-of-dcmtk-binaries-windows
branch
from
d35264d to
a43da9b
Compare
jcfr
force-pushed
the
fix-lookup-of-dcmtk-binaries-windows
branch
from
8d96400 to
9de390e
Compare
…MRetrieve Fixes the reporting of argument conversion errors in "ctkDICOMRetrieve" and ensures correct arguments are passed when calling it from "ctkDICOMApplicationTest1." Initially, the test reported the error: "Could not convert 11112 to an integer for the calledPoint." After addressing the reporting of argument conversion errors, a subsequent error was reported, which helped identify the proper fix: "Could not convert localhost to an integer for the calledPoint."
Check for process exit code and introduce `run_process` and `wait_for_finished` convenience functions.
…dcmqrscp.cfg This addresses the following error reported by the server (): I: Association Received (HOSTNAME:CTK_AE -> CTK_AE) I: Refusing Association (BadAEService) where HOSTNAME corresponds to the actual hostname.
jcfr
force-pushed
the
fix-lookup-of-dcmtk-binaries-windows
branch
from
ced3c3c to
502be12
Compare
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.
ctkDICOMTester
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.
ctkDICOMApplicationTest1
Follow-up on commit 2583a4e ("Remove empty build command and set install command empty.", 2014-11-04) which disabled the systematic installation of DCMTK during the CTK superbuild.
This addresses the binary lookup issue for
ctkDICOMApplicationTest1on Windows by ensuring that all configuration sub-directories are considered during the lookup and by setting the launch environment using the variableCTK_TEST_LAUNCH_BUILD_ENVIRONMENT_MODIFICATION.It also fixex ctkDICOMApplicationTest1 on Windows configuring hostname in
dcmqrscp.cfg. This addresses the following error reported by the server ():where HOSTNAME corresponds to the actual hostname.
ctkDICOMRetrieve
Resolve invocation error in ctkDICOMApplicationTest1 for ctkDICOMRetrieve
Fixes the reporting of argument conversion errors in "ctkDICOMRetrieve" and ensures
correct arguments are passed when calling it from "ctkDICOMApplicationTest1."
Initially, the test reported the error:
Could not convert 11112 to an integer for the calledPoint.After addressing the reporting of argument conversion errors, a subsequent error was
reported, which helped identify the proper fix:
Could not convert localhost to an integer for the calledPoint.Related