Skip to content

[roottest] fix typo in variable name#22031

Merged
dpiparo merged 1 commit intoroot-project:masterfrom
ferdymercury:patch-21
Apr 24, 2026
Merged

[roottest] fix typo in variable name#22031
dpiparo merged 1 commit intoroot-project:masterfrom
ferdymercury:patch-21

Conversation

@ferdymercury
Copy link
Copy Markdown
Collaborator

ROOT_genreflex_CMD is used everywhere
not ROOT_genreflex_cmd

Found out while investigating failures in #21890

ROOT_genreflex_CMD is used everywhere
not ROOT_genreflex_cmd

Found out while investigating failures in  root-project#21890
@ferdymercury ferdymercury requested a review from bellenot as a code owner April 23, 2026 15:00
@ferdymercury ferdymercury requested review from linev and pcanal April 23, 2026 15:00
Copy link
Copy Markdown
Member

@bellenot bellenot left a comment

Choose a reason for hiding this comment

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

Good catch, thanks!

endif()
set(ROOT_genreflex_cmd ${ROOT_BINDIR}/genreflex)
set(ROOT_genreflex_CMD ${ROOT_BINDIR}/genreflex)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Note we should probably see if we can now remove the duplicate (former main) settings:

roottest/CMakeLists.txt:  set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex.exe CACHE INTERNAL "ROOTTEST variable for genreflex executable")

roottest/CMakeLists.txt:  set(ROOT_genreflex_CMD ${ROOTSYS}/bin/genreflex CACHE INTERNAL "ROOTTEST variable for genreflex executable")

Copy link
Copy Markdown
Collaborator Author

@ferdymercury ferdymercury Apr 23, 2026

Choose a reason for hiding this comment

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

They are used for different things, so not easily:

  • A: one is for macros, only used when you call REFLEX_GENERATE_DICTIONARY or, from within roottest, when you call ROOTTEST_GENERATE_REFLEX_DICTIONARY. This variant uses ROOT_BIN_DIR
  • B: the other one is for manual commands within roottests such as COMMAND ${ROOT_genreflex_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/abc.h -o. This variant uses ROOTSYS.

So two questions:

  • should there be an if-else in version A) so that it resolves to genreflex.exe in Windows? Or maybe something more modern like using $<TARGET_FILE:tgt> ?
  • should we replace
    ROOTTEST_ADD_TEST(5594 COMMAND ${ROOT_genreflex_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/AliAODPid.h -o AliAODPid.cxx --select=${CMAKE_CURRENT_SOURCE_DIR}/AliAODPid_selection.xml)
    with sth like:
    ROOTTEST_GENERATE_REFLEX_DICTIONARY(AliAODPid.h SELECTION AliAODPid_selection.xml)
    to avoid those duplicities of the CMD definition?

Maybe in a follow-up PR ?

Tagging also @guitargeek since he has dealt with ROOTSYS removal.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

alternative approach: #22034

ROOTSYS part: #22032

Copy link
Copy Markdown
Member

@pcanal pcanal left a comment

Choose a reason for hiding this comment

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

LGTM (although we may want to take care of the duplicate setting)

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 23, 2026

Test Results

    22 files      22 suites   3d 11h 21m 22s ⏱️
 3 850 tests  3 848 ✅  1 💤 1 ❌
76 910 runs  76 891 ✅ 18 💤 1 ❌

For more details on these failures, see this check.

Results for commit 4f148f1.

♻️ This comment has been updated with latest results.

@dpiparo dpiparo merged commit 7a87fb8 into root-project:master Apr 24, 2026
48 of 53 checks passed
@dpiparo
Copy link
Copy Markdown
Member

dpiparo commented Apr 24, 2026

/backport to 6.40

@root-project-bot
Copy link
Copy Markdown

This PR has been backported to branch 6.40: #22037

@ferdymercury ferdymercury deleted the patch-21 branch April 24, 2026 05:39
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.

5 participants