Set new package deps graph vars combining external and internal packages (#63)

test/ci_support/CMakeCache.large.txt

@@ -3810,8 +3810,6 @@ TPL_ENABLE_X11:STRING=
 //  This can be set to 'ON', 'OFF', or left empty ''.
 TPL_ENABLE_XDMF:STRING=
 
-TPL_ENABLE_Zlib:BOOL=ON
-
 //Enable support for the TPL couple in all supported VERA packages.
 //  This can be set to 'ON', 'OFF', or left empty ''.
 TPL_ENABLE_couple:STRING=
@@ -3909,20 +3907,6 @@ TPL_SILO_LIBRARIES:FILEPATH=/projects/vera/gcc-4.8.3/tpls/opt/silo-4.10.2/lib/li
 //autoset
 TPL_TENTATIVE_ENABLE_Pthread:STRING=ON
 
-//List of semi-colon separated paths to append to the compile invocations
-// to find the headers for the TPL Zlib.  This is the final variable
-// that is used in the build commands.  The user variable Zlib_INCLUDE_DIRS
-// is used to look for the given headers first but is just a suggestion.
-// This variable, however, is the final value and will not be touched.
-TPL_Zlib_INCLUDE_DIRS:PATH=/projects/vera/gcc-4.8.3/tpls/opt/zlib-1.2.7/include
-
-//List of semi-colon separated full paths to the libraries for
-// the TPL Zlib.  This is the final variable that is used in the
-// link commands.  The user variable Zlib_LIBRARY_DIRS is used
-// to look for the know library names but but is just a suggestion.
-// This variable, however, is the final value and will not be touched.
-TPL_Zlib_LIBRARIES:FILEPATH=/projects/vera/gcc-4.8.3/tpls/opt/zlib-1.2.7/lib/libz.so
-
 //If set to true, then strong warnings for package Teko will be
 // disabled.
 Teko_DISABLE_STRONG_WARNINGS:BOOL=OFF
@@ -4510,9 +4494,6 @@ VERAIn_XML_ENABLE_TESTS:STRING=
 //No help, variable specified on the command line.
 VERA_ALLOW_NO_PACKAGES:BOOL=ON
 
-//Determines if asserts are performed on missing packages or not.
-VERA_ASSERT_MISSING_PACKAGES:BOOL=ON
-
 //Value Computed by CMake
 VERA_BINARY_DIR:STATIC=/localhome/8vt/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/BUILD
 
@@ -6815,17 +6796,6 @@ XsdrnFlux_LIB_DEPENDS:STATIC=general;MGTransportLib;general;ampxClib;general;amp
 //Dependencies for the target
 XsdrnFlux_fortranlib_LIB_DEPENDS:STATIC=general;XsdrnFlux;
 
-Zlib_INCLUDE_DIRS:FILEPATH=/projects/vera/gcc-4.8.3/tpls/opt/zlib-1.2.7/include
-
-Zlib_LIBRARY_DIRS:FILEPATH=/projects/vera/gcc-4.8.3/tpls/opt/zlib-1.2.7/lib
-
-//List of semi-colon separated names of libraries needed to link
-// to for the TPL Zlib.  This list of libraries will be search
-// for in FIND_LIBRARY(...) calls along with the directories specified
-// with Zlib_LIBRARY_DIRS.  NOTE: This is not the final list of
-// libraries used for linking.  That is specified by TPL_Zlib_LIBRARIES!
-Zlib_LIBRARY_NAMES:STRING=z
-
 //If set to true, then strong warnings for package Zoltan will
 // be disabled.
 Zoltan_DISABLE_STRONG_WARNINGS:BOOL=OFF
@@ -6907,12 +6877,6 @@ _SILO_silo.h_PATH:PATH=/projects/vera/gcc-4.8.3/tpls/opt/silo-4.10.2/include
 //Path to a library.
 _SILO_siloh5_LIBRARY:FILEPATH=/projects/vera/gcc-4.8.3/tpls/opt/silo-4.10.2/lib/libsiloh5.so
 
-//Path to a library.
-_Zlib_z_LIBRARY:FILEPATH=/projects/vera/gcc-4.8.3/tpls/opt/zlib-1.2.7/lib/libz.so
-
-//Path to a file.
-_Zlib_zlib.h_PATH:PATH=/projects/vera/gcc-4.8.3/tpls/opt/zlib-1.2.7/include
-
 //Path to a file.
 _fcmakelists:FILEPATH=/home/8vt/localhome/PROJECTS/VERA.base/VERA/TriBITS/tribits/core/config_tests/fmangle
 
@@ -11552,8 +11516,6 @@ TPL_ENABLE_VTune-STRINGS:INTERNAL=;ON;OFF
 TPL_ENABLE_X11-STRINGS:INTERNAL=;ON;OFF
 //STRINGS property for variable: TPL_ENABLE_XDMF
 TPL_ENABLE_XDMF-STRINGS:INTERNAL=;ON;OFF
-//STRINGS property for variable: TPL_ENABLE_Zlib
-TPL_ENABLE_Zlib-STRINGS:INTERNAL=;ON;OFF
 //STRINGS property for variable: TPL_ENABLE_couple
 TPL_ENABLE_couple-STRINGS:INTERNAL=;ON;OFF
 //STRINGS property for variable: TPL_ENABLE_gpcd
@@ -11604,12 +11566,6 @@ TPL_SILO_LIBRARY_DIRS:INTERNAL=
 TPL_SILO_NOT_FOUND:INTERNAL=FALSE
 //ADVANCED property for variable: TPL_TENTATIVE_ENABLE_Pthread
 TPL_TENTATIVE_ENABLE_Pthread-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TPL_Zlib_INCLUDE_DIRS
-TPL_Zlib_INCLUDE_DIRS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: TPL_Zlib_LIBRARIES
-TPL_Zlib_LIBRARIES-ADVANCED:INTERNAL=1
-TPL_Zlib_LIBRARY_DIRS:INTERNAL=
-TPL_Zlib_NOT_FOUND:INTERNAL=FALSE
 TRIBITS_ADD_TEST_ADD_TEST_INPUT:INTERNAL=
 TRIBITS_SET_TEST_PROPERTIES_INPUT:INTERNAL=
 TRILINOS_HAVE_LINEAR_SOLVER_FACTORY_REGISTRATION:INTERNAL=ON
@@ -12155,8 +12111,6 @@ VERAIn_XML_TEST_OPTIONAL_DEP_PACKAGES:INTERNAL=
 VERAIn_XML_TEST_REQUIRED_DEP_PACKAGES:INTERNAL=
 //ADVANCED property for variable: VERA_ALLOW_NO_PACKAGES
 VERA_ALLOW_NO_PACKAGES-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: VERA_ASSERT_MISSING_PACKAGES
-VERA_ASSERT_MISSING_PACKAGES-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: VERA_CDASH_DEPS_XML_OUTPUT_FILE
 VERA_CDASH_DEPS_XML_OUTPUT_FILE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: VERA_CMAKE_EXECUTABLE_SUFFIX
@@ -13472,12 +13426,6 @@ YieldSampler_LIB_OPTIONAL_DEP_PACKAGES:INTERNAL=
 YieldSampler_LIB_REQUIRED_DEP_PACKAGES:INTERNAL=ScaleLib;Origen;SequenceCouple;AmpxLoader;AmpxLoader;AmpxLib;ScaleResource;ScaleList;ScaleUtilsIO;ScaleFileUtils;ScaleFileUtils
 YieldSampler_TEST_OPTIONAL_DEP_PACKAGES:INTERNAL=
 YieldSampler_TEST_REQUIRED_DEP_PACKAGES:INTERNAL=
-//ADVANCED property for variable: Zlib_INCLUDE_DIRS
-Zlib_INCLUDE_DIRS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: Zlib_LIBRARY_DIRS
-Zlib_LIBRARY_DIRS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: Zlib_LIBRARY_NAMES
-Zlib_LIBRARY_NAMES-ADVANCED:INTERNAL=1
 Zoltan2_LIB_OPTIONAL_DEP_PACKAGES:INTERNAL=
 Zoltan2_LIB_REQUIRED_DEP_PACKAGES:INTERNAL=Tpetra;Epetra;Teuchos;Xpetra;Zoltan
 Zoltan2_TEST_OPTIONAL_DEP_PACKAGES:INTERNAL=
@@ -13527,10 +13475,6 @@ _PETSC_petsc_LIBRARY-ADVANCED:INTERNAL=1
 _SILO_silo.h_PATH-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: _SILO_siloh5_LIBRARY
 _SILO_siloh5_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: _Zlib_z_LIBRARY
-_Zlib_z_LIBRARY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: _Zlib_zlib.h_PATH
-_Zlib_zlib.h_PATH-ADVANCED:INTERNAL=1
 //Result of TRY_COMPILE
 _fcmngl:INTERNAL=TRUE
 ctf_unit_test_harness_INCLUDE_DIRS:INTERNAL=/localhome/8vt/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/BUILD;/home/8vt/localhome/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/VERA/SCALE/packages;/localhome/8vt/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/BUILD/SCALE/packages;/home/8vt/localhome/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/VERA/SCALE/Exnihilo/packages;/localhome/8vt/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/BUILD/SCALE/Exnihilo/packages;/localhome/8vt/PROJECTS/VERA.base/BUILDS/GCC-4.8.3/MOCK_MPI_DEBUG_GCC461_CI/BUILD/COBRA-TF/cobra_tf/utils

test/ci_support/TrilinosPackageDependencies.extraRepoOnePackage.gold.xml

@@ -61,7 +61,7 @@
     <TEST_REQUIRED_DEP_PACKAGES/>
     <TEST_OPTIONAL_DEP_PACKAGES/>
     <LIB_REQUIRED_DEP_TPLS/>
-    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch,Zlib"/>
+    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch"/>
     <TEST_REQUIRED_DEP_TPLS/>
     <TEST_OPTIONAL_DEP_TPLS/>
     <EmailAddresses>

test/ci_support/TrilinosPackageDependencies.gold.xml

@@ -61,7 +61,7 @@
     <TEST_REQUIRED_DEP_PACKAGES/>
     <TEST_OPTIONAL_DEP_PACKAGES/>
     <LIB_REQUIRED_DEP_TPLS/>
-    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch,Zlib"/>
+    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch"/>
     <TEST_REQUIRED_DEP_TPLS/>
     <TEST_OPTIONAL_DEP_TPLS/>
     <EmailAddresses>

test/ci_support/TrilinosPackageDependencies.preCopyrightTrilinos.extraTrilinosRepo.gold.xml

@@ -61,7 +61,7 @@
     <TEST_REQUIRED_DEP_PACKAGES/>
     <TEST_OPTIONAL_DEP_PACKAGES/>
     <LIB_REQUIRED_DEP_TPLS/>
-    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch,Zlib"/>
+    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch"/>
     <TEST_REQUIRED_DEP_TPLS/>
     <TEST_OPTIONAL_DEP_TPLS/>
     <EmailAddresses>

test/ci_support/TrilinosPackageDependencies.preCopyrightTrilinos.gold.xml

@@ -61,7 +61,7 @@
     <TEST_REQUIRED_DEP_PACKAGES/>
     <TEST_OPTIONAL_DEP_PACKAGES/>
     <LIB_REQUIRED_DEP_TPLS/>
-    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch,Zlib"/>
+    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch"/>
     <TEST_REQUIRED_DEP_TPLS/>
     <TEST_OPTIONAL_DEP_TPLS/>
     <EmailAddresses>

test/ci_support/TrilinosPackageDependencies.preRepoOnePackage.preCopyrightTrilinos.gold.xml

@@ -75,7 +75,7 @@
     <TEST_REQUIRED_DEP_PACKAGES/>
     <TEST_OPTIONAL_DEP_PACKAGES/>
     <LIB_REQUIRED_DEP_TPLS/>
-    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch,Zlib"/>
+    <LIB_OPTIONAL_DEP_TPLS value="MPI,ParMETIS,Scotch"/>
     <TEST_REQUIRED_DEP_TPLS/>
     <TEST_OPTIONAL_DEP_TPLS/>
     <EmailAddresses>

test/core/CMakeLists.txt

@@ -49,7 +49,7 @@ tribits_add_advanced_test( TestingFunctionMacro_UnitTests
       -D${PROJECT_NAME}_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}
       -P "${CMAKE_CURRENT_SOURCE_DIR}/TestingFunctionMacro_UnitTests.cmake"
     PASS_REGULAR_EXPRESSION_ALL
-      "Final UnitTests Result: num_run = 708"
+      "Final UnitTests Result: num_run = 707"
       "Final UnitTests Result: PASSED"
   )
 

test/core/DependencyUnitTests/CMakeLists.txt

@@ -68,6 +68,7 @@ set(REDUCED_MOCK_TRILINOS_DIR
 set(REDUCED_MOCK_TRILINOS_OUTPUT_DIR
   "${${PROJECT_NAME}_TRIBITS_DIR}/doc/guides/ReducedMockTrilinosOutput")
 
+
 #
 # NOTE: These tests compare against expected output stored in files under the
 # in the guides/ReducedMockTrilinosOuptut/ directory and are used in the
@@ -106,11 +107,10 @@ function(create_reduced_dependency_handling_test_case TEST_NAME)
 endfunction()
 
 
-#
 # Read in an expected output file and create a REGEX array to be used in
-# checking test results.
+# checking test results (and replace all problematic chars as appropriate
+# regex).
 #
-
 function(read_expected_output_file_into_regex_array  EXPECTED_OUTPUT_FILE
   EXPECTED_OUTPUT_REGEX_ARRAY_OUT
   )
@@ -123,11 +123,11 @@ function(read_expected_output_file_into_regex_array  EXPECTED_OUTPUT_FILE
     #print_var(EXPECTED_RAW_STR)
     if (NOT "${EXPECTED_RAW_STR}" STREQUAL "")
       set(EXPECTED_REGEX_STR "${EXPECTED_RAW_STR}")
-      string(REPLACE "(" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}") 
-      string(REPLACE ")" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}") 
-      string(REPLACE "[" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}") 
-      string(REPLACE "]" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}") 
-      string(REPLACE "*" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}") 
+      string(REPLACE "[" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}")
+      string(REPLACE "]" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}")
+      string(REPLACE "(" "[(]" EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}")
+      string(REPLACE ")" "[)]" EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}")
+      string(REPLACE "*" "." EXPECTED_REGEX_STR "${EXPECTED_REGEX_STR}")
       list(APPEND EXPECTED_REGEX_ARRAY "${EXPECTED_REGEX_STR}")
       #print_var(EXPECTED_REGEX_ARRAY)
     endif()
@@ -547,7 +547,8 @@ create_dependency_handling_test_case(
   ARGS
     -DTrilinos_ENABLE_ALL_PACKAGES:BOOL=ON
     -DTrilinos_DUMP_PACKAGE_DEPENDENCIES:BOOL=ON
--DTrilinos_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES=ON
+    -DTrilinos_DUMP_FORWARD_PACKAGE_DEPENDENCIES:BOOL=ON
+    -DTrilinos_WARN_ABOUT_MISSING_EXTERNAL_PACKAGES=ON
   PASS_REGULAR_EXPRESSION_ALL
     "${EnableAllPackages_DumpDependencies_REGEX_ARRAY}"
     "Final set of enabled top-level packages:  TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Stratimikos RBGen 19"
@@ -1259,24 +1260,63 @@ create_dependency_handling_test_case(
   preCopyrightTrilinos_ShowInvalidPackageNameError
   ARGS -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos
     -DSHOW_INVALID_PACKAGE_NAME_ERROR=ON
-    -DTrilinos_ASSERT_MISSING_PACKAGES=ON
+    -DTrilinos_ASSERT_DEFINED_DEPENDENDCIES=FATAL_ERROR
+  PASS_REGULAR_EXPRESSION_ALL
+    "CMake Error at .*/TribitsReadDepsFilesCreateDepsGraph.cmake:.+ [(]message[)]:"
+    "Error, the package 'Anasazi' is listed as a dependency of the package"
+    "'Teko' but the package 'Anasazi' is either not defined or is listed later"
+    "in the package order[.]  This may also be an attempt to create a circular"
+    "dependency between the packages 'Anasazi' and 'Teko' [(]which is not"
+    "allowed[)][.]  Check the spelling of 'Anasazi' or see how it is listed in a"
+    "call to tribits_repository_define_packages[(][)] in relation to 'Teko'[.]  To"
+    "ignore/disable the undefined package 'Anasazi', set the cache variable"
+    "Trilinos_ASSERT_DEFINED_DEPENDENCIES=IGNORE[.]"
+  )
+
+
+create_dependency_handling_test_case(
+  ShowInvalidTplNameError
+  ARGS -DTrilinos_ASSERT_DEFINED_DEPENDENCIES=FATAL_ERROR
+    -DSHOW_INVALID_TPL_NAME_ERROR=ON
+  PASS_REGULAR_EXPRESSION_ALL
+    "CMake Error at .*/TribitsReadDepsFilesCreateDepsGraph.cmake:.+ [(]message[)]:"
+    "Error, the package 'Zlib' is listed as a dependency of the package 'Zoltan'"
+    "but the package 'Zlib' is either not defined or is listed later in the"
+    "package order."
+  )
+  # NOTE: The reset of the error message is checked in the test
+  # preCopyrightTrilinos_ShowInvalidPackageNameError above.
+
+
+create_dependency_handling_test_case(
+  AssertDefinedDependenciesBadValue
+  ARGS -DTrilinos_ASSERT_DEFINED_DEPENDENCIES=BadValue
+  PASS_REGULAR_EXPRESSION_ALL
+    "CMake Error at .*/tribits/core/utils/TribitsAddEnumCacheVar.cmake:[0-9]+ [(]message[)]:"
+    "  Error, the cache var Trilinos_ASSERT_DEFINED_DEPENDENCIES with value"
+    "  'BadValue' is not in the list of allowed values: 'FATAL_ERROR',"
+    "  'SEND_ERROR', 'WARNING', 'NOTICE', 'IGNORE', 'OFF' [(]default 'FATAL_ERROR'[)]"
+  )
+
+
+create_dependency_handling_test_case(
+  preCopyrightTrilinos_ShowInvalidPackageNameAndTplNameError
+  ARGS -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos
+    -DSHOW_INVALID_PACKAGE_NAME_ERROR=ON
+    -DSHOW_INVALID_TPL_NAME_ERROR=ON
+    -DTrilinos_ASSERT_DEFINED_DEPENDENCIES=SEND_ERROR
   PASS_REGULAR_EXPRESSION_ALL
     "CMake Error at .*/TribitsReadDepsFilesCreateDepsGraph.cmake:.+ [(]message[)]:"
     "Error, the package 'Anasazi' is listed as a dependency of the package"
-    "'Teko' is in the list 'Trilinos_DEFINED_INTERNAL_PACKAGES' but the package"
-    "'Anasazi' is either not defined or is listed later in the package order[.]"
-    "This may also be an attempt to create a circular dependency between the"
-    "packages 'Anasazi' and 'Teko' [(]which is not allowed[)][.]  Check the spelling"
-    "of 'Anasazi' or see how it is listed in a call to"
-    "tribits_repository_define_packages[(][)] in relation to 'Teko'[.]"
+    "Error, the package 'Zlib' is listed as a dependency of the package 'Zoltan'"
   )
 
 
 create_dependency_handling_test_case(
   preCopyrightTrilinos_ShowInvalidPackageSelfDependency
   ARGS -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos
     -DSHOW_SELF_PACKAGE_DEPENDENCY_ERROR=ON
-    -DTrilinos_ASSERT_MISSING_PACKAGES=ON
+    -DTrilinos_ASSERT_DEFINED_DEPENDENDCIES=FATAL_ERROR
   PASS_REGULAR_EXPRESSION_ALL
     "Error, the package 'Teko' is listed as a dependency of itself in the list"
     " 'LIB_REQUIRED_DEP_PACKAGES'!"
@@ -1287,7 +1327,7 @@ create_dependency_handling_test_case(
   preCopyrightTrilinos_ShowInvalidSubpackageSelfDependency
   ARGS
     -DSHOW_SELF_SUBPACKAGE_DEPENDENCY_ERROR=ON
-    -DTrilinos_ASSERT_MISSING_PACKAGES=ON
+    -DTrilinos_ASSERT_DEFINED_DEPENDENDCIES=FATAL_ERROR
   PASS_REGULAR_EXPRESSION_ALL
     "Error, the package 'ThyraTpetra' is listed as a dependency of itself in the"
      " list 'LIB_REQUIRED_DEP_PACKAGES'!"