Merged
Conversation
Remove thaumatin tests; they are not run in Makefile (thaumatin_die_M1S5_1_0005_2.cbf test file is not used). cbf2nexus and nexus2cbf are tested on 1191_00005.cbf test file. Now passes 72 out of 89 (81%) CTest tests.
Use minicbf_orig.h5 instead of minicbf_original.h5, because that is what Makefile does. Now passes 76 out of 92 (83%) CTest tests.
These tests rely on convert_minicbf-v1, which now, as per Makefile, is comparing to insulin_pilatus6mconverted_orig.cbf instead of insulin_pilatus6mconverted_rev_orig.cbf. Remove cmp-insulin_pilatus6mconverted_orig.cbf.h5.cbf-insulin_pilatus6mconverted_encI.cbf.h5.cbf, which does not exist in Makefile. Add the cif2cbf-encz tests. Now passes 101 out of 110 (92%) CTest tests.
Refactor data FetchContent blocks. Now passes 110 out of 110 (100%) CTest tests.
Add cbf_testxfelread and test_cbf_airy_disk test executables, remove testtree, and make testulp conditional on CBF_ENABLE_ULP. Replace testcell.cmake with more general redirect.cmake. All tests clean up after themselves. Fortran, Java, and Python tests are not covered. Now passes 143 out of 143 (100%) CTest tests.
Collaborator
|
Nicely done.
Please note that the legacy 0.9.8 release when tested in the docker
ubuntu latest environment passed all its tests except for java, including
python and fortran. The java tests in the Makefile seem to have gotten put
aside in recent years. I would suggest that we try to get the full set of
test cases working under cmake for everything including python, fortran,
and java by the end of calendar 2025, as per the plan in the R24 proposal.
Note that the an element in getting both the fortran and python to work
simultaneously under the current state of swig was to use the 2-year old
swig-fortran for the fortran tests and the current swig for the python
tests. I suspect we will have a similar problem with java.
…On Fri, Apr 4, 2025 at 12:47 PM Johan Hattne ***@***.***> wrote:
Fortran, Java, and Python tests are not covered. Now passes 143 out of 143
(100%) *CTest* tests.
------------------------------
You can view, comment on, or merge this pull request online at:
#79
Commit Summary
- fb5688d
<fb5688d>
Fix cbf2nexus/nexus2cbf roundtrip tests
- 64abb68
<64abb68>
Fix minicbf2nexus tests
- 3ca701a
<3ca701a>
Fix cif2cbf roundtrip tests
- 6276167
<6276167>
Patch in- and output data
- bec6a5b
<bec6a5b>
Synchronize basic (core), extra, and dectristests tests to Makefile
File Changes
(6 files <https://github.com/dials/cbflib/pull/79/files>)
- *M* CMakeLists.txt
<https://github.com/dials/cbflib/pull/79/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20a>
(1639)
- *A* examples/batch_convert_minicbf.cmake
<https://github.com/dials/cbflib/pull/79/files#diff-20859600a69ca28f2c86f9287c6a34ba48652c66f91659b87d1e6c903f5dc506>
(77)
- *D* examples/testcell.cmake
<https://github.com/dials/cbflib/pull/79/files#diff-fb4edce5a823467953c2bc30f9045c43ed97d71a41450d749d2016a40c7920d0>
(247)
- *A* patches/cbflib-data-input-0.9.8.patch
<https://github.com/dials/cbflib/pull/79/files#diff-8eee6947a7d975d552b4fd6ad9dfab252bf0df2786cad1643153fc0abbabed4b>
(37)
- *M* patches/cbflib-data-output-0.9.8.patch
<https://github.com/dials/cbflib/pull/79/files#diff-b23d632d5f7415cf3aad8a12d51e9dd28a668058cbef07fbd7d9c23d06840cc4>
(82)
- *A* redirect.cmake
<https://github.com/dials/cbflib/pull/79/files#diff-c5aaf92347b7c0a971a2e1f9d4202894d615015204a26aa51db59dfe9e9f42d2>
(29)
Patch Links:
- https://github.com/dials/cbflib/pull/79.patch
- https://github.com/dials/cbflib/pull/79.diff
—
Reply to this email directly, view it on GitHub
<#79>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABB6EAPJVTOZRWPBYUKBW2L2X2ZQLAVCNFSM6AAAAAB2PFPLN6VHI2DSMVQWIX3LMV43ASLTON2WKOZSHE3TEOJRGM4DGMI>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***>
|
Collaborator
Author
|
Am I to interpret your message as "OK to merge" (the PR only touches CMake-stuff). Or do I wait for 0.9.8 to make it out the door? |
Collaborator
|
Please wait until Dan responds. I hope we will do the 0.9,8 legacy release
tomorrow.
…On Wed, Apr 9, 2025 at 1:18 AM Johan Hattne ***@***.***> wrote:
Am I to interpret your message as "OK to merge" (the PR only touches
*CMake*-stuff). Or do I wait for 0.9.8 to make it out the door?
—
Reply to this email directly, view it on GitHub
<#79 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABB6EAM2ZCWXARA7O2EHKBD2YSUUHAVCNFSM6AAAAAB2PFPLN6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDOOBYGMYDONBWG4>
.
You are receiving this because you commented.Message ID:
***@***.***>
*hattne* left a comment (dials/cbflib#79)
<#79 (comment)>
Am I to interpret your message as "OK to merge" (the PR only touches
*CMake*-stuff). Or do I wait for 0.9.8 to make it out the door?
—
Reply to this email directly, view it on GitHub
<#79 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABB6EAM2ZCWXARA7O2EHKBD2YSUUHAVCNFSM6AAAAAB2PFPLN6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDOOBYGMYDONBWG4>
.
You are receiving this because you commented.Message ID:
***@***.***>
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fortran, Java, and Python tests are not covered. Now passes 143 out of 143 (100%) CTest tests.