Skip to content

Commit

Permalink
Set -DTribitsExMetaProj_SHOW_GIT_COMMIT_PARENTS=ON for multi-repo test (
Browse files Browse the repository at this point in the history
TriBITSPub#597)

This sets the option:

  -DTribitsExMetaProj_SHOW_GIT_COMMIT_PARENTS=ON

in the inner CMake configuration with a multi-repo setup so we can test the
extraction and printing of the parent commit info.  This tests a call of the
function tribits_generate_single_repo_version_string() for extra repos from
the function tribits_generate_repo_version_file_string().  This test also
validates that the correct Git commands are called since this uses real Git on
a Git repos.

The downside of this updated test is that it makes it a little more difficult
to maintain these tests when we have to update these snapshotted Git repos.
  • Loading branch information
bartlettroscoe committed Jan 24, 2024
1 parent 731841e commit 62fb374
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
1 change: 1 addition & 0 deletions test/ctest_driver/TribitsExampleMetaProject/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ tribits_add_advanced_test( CTestDriver_TribitsExMetaProj_clone_default_branch_re
${COMMON_ENV_ARGS}
TribitsExMetaProj_ENABLE_SECONDARY_TESTED_CODE=TRUE
CTEST_BUILD_NAME=CTestDriver_TribitsExMetaProj_clone_default_branch_remote
TribitsExMetaProj_EXTRA_CONFIGURE_OPTIONS=-DTribitsExMetaProj_SHOW_GIT_COMMIT_PARENTS=ON
CTEST_SITE=CustomSite
${CTEST_S_SCRIPT_ARGS}
PASS_REGULAR_EXPRESSION_ALL
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@
*** Base Git Repo: TribitsExMetaProj
863461e [Tue Sep 14 15:05:31 2021 -0600] <[email protected]>
Merge branch 'tribits-github-snapshot' (TriBITSPub/TriBITS#299)
*** Parent 1:
e12aad9 [Fri Dec 11 16:17:18 2020 -0700] <[email protected]>
Merge branch 'tribits-github-snapshot' (TriBITSPub/TriBITS#309)
*** Parent 2:
ed38a1f [Tue Sep 14 15:04:06 2021 -0600] <[email protected]>
Automatic snapshot commit from TribitsExampleMetaProject at d1e4913
*** Git Repo: TribitsExampleProject
94c2b12 [Tue Sep 14 15:18:55 2021 -0600] <[email protected]>
Merge branch 'tribits-github-snapshot' (TriBITSPub/TriBITS#299)
*** Parent 1:
59c7057 [Fri Dec 11 16:23:46 2020 -0700] <[email protected]>
Merge branch 'tribits-github-snapshot'
*** Parent 2:
da4197f [Tue Sep 14 15:11:39 2021 -0600] <[email protected]>
Automatic snapshot commit from TribitsExampleProject at d95ddbd
*** Git Repo: TribitsExampleProjectAddons
d846ae1 [Tue Sep 14 15:23:39 2021 -0600] <[email protected]>
Merge branch 'tribits-github-snapshot' (TriBITSPub/TriBITS#299)
*** Parent 1:
226a17e [Tue Feb 19 06:33:23 2019 -0700] <[email protected]>
Update README file (tribitspub/tribits#278)
*** Parent 2:
08f06bb [Tue Sep 14 15:20:24 2021 -0600] <[email protected]>
Automatic snapshot commit from TribitsExampleProjectAddons at abb6694

0 comments on commit 62fb374

Please sign in to comment.