Skip to content
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

DEBUG WIP: Test find_package() with lib64 #596

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
11f57fc
Codespell: Add ignores for sphinx generated documents
bartlettroscoe Jul 28, 2023
139928c
tribits_sort_list_according_to_master_list(): Update doc and var name…
bartlettroscoe Sep 5, 2023
9bc7092
Move TribitsSortListAccordingToMasterList.cmake to tribits/core/utils…
bartlettroscoe Sep 5, 2023
4cf58ea
Minor formatting update (#582)
bartlettroscoe Sep 5, 2023
297f55f
WIP: Add failing test for using raw CMake for Package1 in TriBITS pro…
bartlettroscoe Jul 14, 2023
3fc5a44
Rename function and improve documentation (#582)
bartlettroscoe Jul 18, 2023
11ad538
Make TriBITS package with raw CMake work (#582)
bartlettroscoe Jul 18, 2023
5aa2622
Remove special raw CMake package logic for lib install dir (#582)
bartlettroscoe Aug 3, 2023
0cfa82a
Set TribitsExProj2_USE_GNUINSTALLDIRS=ON only for find_package tests …
bartlettroscoe Aug 4, 2023
509cdb0
WIP: Add failing test for using tribits_add_test() in raw CMake packa…
bartlettroscoe Aug 22, 2023
67a1f79
Make tribits_add_test() work from a raw CMake package in TriBITS proj…
bartlettroscoe Aug 22, 2023
83bc795
Enable tests for raw CMake Package1 stand-alone configuration (#582)
bartlettroscoe Aug 22, 2023
74ad726
Add TribitsSetCacheVarAndDefault.cmake (#582)
bartlettroscoe Sep 1, 2023
b49a5b0
Move <Project>_TRACE_ADD_TEST to TribitsAddTestHelpers.cmake
bartlettroscoe Sep 4, 2023
3f284fd
WIP: Add failing test for using TirBITS tests functions in a raw CMak…
bartlettroscoe Aug 22, 2023
286a275
Get tribits_add_test() to work with raw CMake project (#582)
bartlettroscoe Sep 5, 2023
c4b2745
Break out tribits_add_test() modules to core/test_support/ (#368, #582)
bartlettroscoe Sep 5, 2023
1f69bbb
Rename 'Package_by_Package' to 'PBP' (#582)
bartlettroscoe Sep 5, 2023
7332f9b
Get tribits_add_advanced_test() to work from non-CMake projects (#368…
bartlettroscoe Sep 6, 2023
9a09873
Move TribitsAddAdvancedTest[Helper].cmake to core/test_support/ (#368…
bartlettroscoe Sep 6, 2023
fcd82bb
tribits_add_advanced_test(): Update section on using in non-TriBITS p…
bartlettroscoe Sep 6, 2023
950e528
Break out clean CMakeLists.[raw|tribits].cmake files (#582)
bartlettroscoe Sep 6, 2023
32f8247
Add conditional for generating <Package>Config.cmake for build dir (#…
bartlettroscoe Sep 7, 2023
56059fa
Factor longer parts out of base CMakeLists.raw.cmake to streamline (#…
bartlettroscoe Sep 8, 2023
ef450ea
Add NAME and COMMAND to add_test() command in build ref doc (#582)
bartlettroscoe Sep 14, 2023
617df45
SQUASH AGAINST: Factor longer parts out of base CMakeLists.raw.cmake …
bartlettroscoe Sep 14, 2023
eddbfc1
Add HowTos for TriBITS-compliant raw CMake packages (#582)
bartlettroscoe Sep 14, 2023
fa9355f
Add section 'How to use TriBITS testing support in non-TriBITS projec…
bartlettroscoe Sep 14, 2023
bad293d
Fix spelling of package1ConfigRegex (#582)
bartlettroscoe Sep 19, 2023
ca2399a
Remove unneeded quotes around args (#582)
bartlettroscoe Sep 19, 2023
637fa77
Remove duplication in tribits_advanced_set_cache_var_and_default() (#…
bartlettroscoe Sep 19, 2023
de83368
DEBUG WIP: Show failing find_package() lib64 and print statements (#582)
bartlettroscoe Sep 19, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Enable tests for raw CMake Package1 stand-alone configuration (#582)
This will allow me to define and run the tests for Package1 using
tribits_add_test().
  • Loading branch information
bartlettroscoe committed Sep 5, 2023
commit 83bc7950b036be099dc44dd6d0fb8756c33014ee
23 changes: 17 additions & 6 deletions test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1227,11 +1227,12 @@ function(TribitsExampleProject2_External_RawPackage1_then_Package_by_Package
ARGS -s ${${PROJECT_NAME}_TRIBITS_DIR}/examples/TribitsExampleProject2 .

TEST_1
MESSAGE "Configure to build and install just Package1 using raw CMake build system"
MESSAGE "Configure to build, install, and test just Package1 using its raw CMake build system"
WORKING_DIRECTORY Build_Package1
CMND ${CMAKE_COMMAND}
ARGS
${TribitsExampleProject2_COMMON_CONFIG_ARGS}
-DPackage1_ENABLE_TESTS=ON
-DCMAKE_PREFIX_PATH=${tplInstallBaseDir}/install_tpl1
-DCMAKE_INSTALL_PREFIX=../install_package1
../TribitsExampleProject2/packages/package1
Expand All @@ -1250,6 +1251,16 @@ function(TribitsExampleProject2_External_RawPackage1_then_Package_by_Package
CMND ${CMAKE_COMMAND} ARGS --build . --target install

TEST_3
MESSAGE "Test just Package1"
WORKING_DIRECTORY Build_Package1
SKIP_CLEAN_WORKING_DIRECTORY
CMND ${CMAKE_CTEST_COMMAND}
PASS_REGULAR_EXPRESSION_ALL
"1/1 Test [#]1: Package1_Prg [.]* *Passed"
"100% tests passed, 0 tests failed out of 1"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_4
MESSAGE "Configure to build, install, and test Package2"
WORKING_DIRECTORY Build_Package2
CMND ${CMAKE_COMMAND}
Expand Down Expand Up @@ -1303,13 +1314,13 @@ function(TribitsExampleProject2_External_RawPackage1_then_Package_by_Package
# dependencies (i.e. Tpl1) as TriBITS-compliant external packages (which
# shows that the TriBITS project must find Tpl1 again from scratch).

TEST_4
TEST_5
MESSAGE "Build and install just Package2"
WORKING_DIRECTORY Build_Package2
SKIP_CLEAN_WORKING_DIRECTORY
CMND ${CMAKE_COMMAND} ARGS --build . --target install

TEST_5
TEST_6
MESSAGE "Run tests for Package2"
WORKING_DIRECTORY Build_Package2
SKIP_CLEAN_WORKING_DIRECTORY
Expand All @@ -1319,7 +1330,7 @@ function(TribitsExampleProject2_External_RawPackage1_then_Package_by_Package
"100% tests passed, 0 tests failed out of 1"
ALWAYS_FAIL_ON_NONZERO_RETURN

TEST_6
TEST_7
MESSAGE "Configure to build, test, and install the rest of TribitsExampleProject2 (Package2)"
WORKING_DIRECTORY Build
CMND ${CMAKE_COMMAND}
Expand Down Expand Up @@ -1377,13 +1388,13 @@ function(TribitsExampleProject2_External_RawPackage1_then_Package_by_Package
# the needed info from Tpl1, Tpl2, and Tpl3 is pulled in from
# find_package(Package2).

TEST_7
TEST_8
MESSAGE "Build and install the rest of TribitsExampleProject2 (Package3)"
WORKING_DIRECTORY Build
SKIP_CLEAN_WORKING_DIRECTORY
CMND ${CMAKE_COMMAND} ARGS --build . --target install

TEST_8
TEST_9
MESSAGE "Run remaining tests for TribitsExampleProject2 (Package3)"
WORKING_DIRECTORY Build
SKIP_CLEAN_WORKING_DIRECTORY
Expand Down