From 00ca3870b23ddea877be9f1abbaf1e3bfee833ad Mon Sep 17 00:00:00 2001
From: "Roscoe A. Bartlett" <rabartl@sandia.gov>
Date: Wed, 17 Aug 2022 20:11:55 -0600
Subject: [PATCH] Improve TrilinosInstallTests to make more clear (#10896)

Based on the confusion by a Trilinos developer that creatd issue #10896, I
have improved these installation tests in the following way:

* Made it clear that the doInstall test will fail if there are **any** build
  errors in the project

* Print out the install errors to make it clear why the install failed

* Use CTest test fixtures to skip the find_package(Trilinos) and
  simpleBuildAgainstTrilinos tests if the doInstall test fails
---
 packages/TrilinosInstallTests/CMakeLists.txt | 27 +++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/TrilinosInstallTests/CMakeLists.txt b/packages/TrilinosInstallTests/CMakeLists.txt
index 595a7866ecb5..41e32007d1dd 100644
--- a/packages/TrilinosInstallTests/CMakeLists.txt
+++ b/packages/TrilinosInstallTests/CMakeLists.txt
@@ -66,13 +66,18 @@ tribits_add_advanced_test(doInstall
       -P "${CMAKE_CURRENT_SOURCE_DIR}/remove_dir_if_exists.cmake"
 
   TEST_1
-    MESSAGE "Install whatever Trilinos packages have been enabled"
+    MESSAGE "Install enabled and built Trilinos packages (NOTE: This test will fail if the project has **any** build errors!)"
     CMND "${CMAKE_COMMAND}"
     ARGS --install ${PROJECT_BINARY_DIR}
       --prefix ${PROJECT_BINARY_DIR}/install
     OUTPUT_FILE  doInstall.out
     NO_ECHO_OUTPUT
 
+  TEST_2
+    MESSAGE "Grep doInstall.out file produced above to see any errors"
+    CMND grep ARGS -A 50 "CMake Error" doInstall.out
+    PASS_ANY
+
   ADDED_TEST_NAME_OUT  doInstall_name
   )
   # NOTE: Above works even if Trilinos was configured without setting
@@ -81,6 +86,11 @@ tribits_add_advanced_test(doInstall
   # the source dir and the build dir will still be sticking around in the
   # below example build.
 
+if (doInstall_name)
+  set_tests_properties(${doInstall_name}
+    PROPERTIES  FIXTURES_SETUP  doInstall_passed)
+endif()
+
 
 tribits_add_advanced_test(find_package_Trilinos
   OVERALL_NUM_MPI_PROCS 1
@@ -104,8 +114,10 @@ tribits_add_advanced_test(find_package_Trilinos
 
 if (find_package_Trilinos_name)
   set_tests_properties(${find_package_Trilinos_name}
-    PROPERTIES DEPENDS ${doInstall_name} )
+    PROPERTIES  FIXTURES_REQUIRED  doInstall_passed)
 endif()
+# NOTE: Above, only attempt to run the find_package() test if the install
+# command passed or it is guaranteed to fail.
 
 
 tribits_add_advanced_test(simpleBuildAgainstTrilinos
@@ -144,8 +156,17 @@ tribits_add_advanced_test(simpleBuildAgainstTrilinos
 
 if (simpleBuildAgainstTrilinos_name)
   set_tests_properties(${simpleBuildAgainstTrilinos_name}
-    PROPERTIES DEPENDS ${doInstall_name} )
+    PROPERTIES  FIXTURES_REQUIRED  doInstall_passed)
 endif()
+# NOTE: Above, only attempt to build and test the simpleBuildAgainstTrilinos
+# project if the install command passed or it is guaranteed to fail.  Also
+# note that we could have blocked this based on the find_package() test but
+# that runs find_package(Trilinos) for all of Trilinos while the
+# simpleBuildAgainstTrilinos/CMakeLists.txt file only calls
+# find_package(Trilinos COMPONENTS Tpetra) so it could pass when the full
+# find_package(Trilinos) call fails.  Therefore, it makes sense to run the
+# this test for simpleBuildAgainstTrilinos even if the test for the full
+# find_package(Trilinos) command fails.
 
 
 tribits_package_postprocess()