Improving output trace for 'Reading list of packages/TPLs' (TriBITS #73)

Mostly changed: - "Reading a list of extra packages" to "Reading list of PRE/POST extra packages" - "Reading a list of extra TPLs" to "Reading list of PRE/POST extra TPLs" - "Reading the list of packages" to "Reading list of native packages" - "Reading the list of TPLs" to "Reading list of native TPLs" More helpful and correct.
TriBITSPub · Jun 10, 2015 · f1c7bd9 · f1c7bd9
1 parent a8d3019
commit f1c7bd9
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/test/core/DependencyUnitTests/CMakeLists.txt b/test/core/DependencyUnitTests/CMakeLists.txt
@@ -1035,8 +1035,8 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
   PASS_REGULAR_EXPRESSION_ALL
     "-- Adding PRE extra Continuous repository preRepoOnePackage"
     "-- Adding POST extra Continuous repository preCopyrightTrilinos"
-    "Reading a list of extra packages from .*/MockTrilinos/preRepoOnePackage/PackagesList.cmake"
-    "Reading a list of extra TPLs from .*/MockTrilinos/preRepoOnePackage/TPLsList.cmake"
+    "Reading list of PRE extra packages from .*/MockTrilinos/preRepoOnePackage/PackagesList.cmake"
+    "Reading list of PRE extra TPLs from .*/MockTrilinos/preRepoOnePackage/TPLsList.cmake"
     "Final set of enabled SE packages:  preRepoOnePackage TrilinosFramework Teuchos .* Stratimikos RBGen Phalanx Teko ExtraPack"
   )
 # NOTE: The above test shows that PRE extra repos are processed correctly and
@@ -1100,8 +1100,8 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
   ARGS -DTrilinos_EXTRA_REPOSITORIES=MissingExtraRepo
     -DTrilinos_IGNORE_MISSING_EXTRA_REPOSITORIES=OFF
   PASS_REGULAR_EXPRESSION_ALL
-    "ERROR: Skipping missing extra repo 'MissingExtraRepo' packages list file"
-    "ERROR: Skipping missing extra repo 'MissingExtraRepo' TPLs list file"
+    "ERROR: Skipping missing POST extra repo 'MissingExtraRepo' packages list"
+    "ERROR: Skipping missing POST extra repo 'MissingExtraRepo' TPLs list"
     "Configuring incomplete, errors occurred"
   )
 
@@ -1113,8 +1113,8 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
     -DTrilinos_ENABLE_KNOWN_EXTERNAL_REPOS_TYPE=
     -DTRIBITS_PROCESS_EXTRAREPOS_LISTS_DEBUG=TRUE
   PASS_REGULAR_EXPRESSION_ALL
-    "WARNING!  Ignoring missing extra repo 'MissingExtraRepo' packages list file ..+/examples/MockTrilinos/MissingExtraRepo/PackagesList.cmake. on request!"
-    "WARNING!  Ignoring missing extra repo 'MissingExtraRepo' TPLs list file ..+/examples/MockTrilinos/MissingExtraRepo/TPLsList.cmake. on request!"
+    "WARNING!  Ignoring missing POST extra repo 'MissingExtraRepo' packages list file ..+/examples/MockTrilinos/MissingExtraRepo/PackagesList.cmake. on request!"
+    "WARNING!  Ignoring missing POST extra repo 'MissingExtraRepo' TPLs list file ..+/examples/MockTrilinos/MissingExtraRepo/TPLsList.cmake. on request!"
     "Configuring done"
     "Generating done"
   )
@@ -1126,9 +1126,9 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
     -DTrilinos_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON
     -DTrilinos_ENABLE_ALL_PACKAGES:BOOL=ON
   PASS_REGULAR_EXPRESSION_ALL
-    "Reading the list of packages from .*/MockTrilinos/PackagesList.cmake"
-    "Reading the list of packages from .*/MockTrilinos/preCopyrightTrilinos/PackagesList.cmake"
-    "Reading the list of packages from .*/MockTrilinos/extraTrilinosRepo/PackagesList.cmake"
+    "Reading list of native packages from .*/MockTrilinos/PackagesList.cmake"
+    "Reading list of native packages from .*/MockTrilinos/preCopyrightTrilinos/PackagesList.cmake"
+    "Reading list of native packages from .*/MockTrilinos/extraTrilinosRepo/PackagesList.cmake"
     "Final set of enabled packages:  TrilinosFramework Teuchos RTOp Epetra Zoltan Shards Triutils Tpetra EpetraExt Sacado Thyra Isorropia AztecOO Galeri Amesos Intrepid Ifpack ML Belos Stratimikos RBGen Phalanx Teko ExtraPack 24"
     "Configuring done"
     "Generating done"
@@ -1168,7 +1168,7 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
   ARGS -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos
     -DpreCopyrightTrilinos_PACKAGES_LIST_FILE=cmake/Reduced_preCopyrightTrilinos_PackagesList.cmake
   PASS_REGULAR_EXPRESSION_ALL
-    "Reading a list of extra packages from .*/MockTrilinos/cmake/Reduced_preCopyrightTrilinos_PackagesList.cmake"
+    "Reading list of POST extra packages from .*/MockTrilinos/cmake/Reduced_preCopyrightTrilinos_PackagesList.cmake"
     "Trilinos_NUM_PACKAGES='24'"
     "Final set of non-enabled SE packages:  .* Phalanx Panzer Stalix 31"
   )

diff --git a/test/core/ExamplesUnitTests/CMakeLists.txt b/test/core/ExamplesUnitTests/CMakeLists.txt
@@ -1630,10 +1630,10 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProject_TribitsExampleProjectAddons
       TribitsExampleProject
     PASS_REGULAR_EXPRESSION_ALL
       "-- Adding POST extra Continuous repository TribitsExampleProjectAddons "
-      "Reading the list of packages from .*/TribitsExampleProject/PackagesList.cmake"
-      "Reading the list of TPLs from .*/TribitsExampleProject/TPLsList.cmake"
-      "Reading a list of extra packages from .*/TribitsExampleProject/TribitsExampleProjectAddons/PackagesList.cmake"
-      "Reading a list of extra TPLs from .*/TribitsExampleProject/TribitsExampleProjectAddons/TPLsList.cmake"
+      "Reading list of native packages from .*/TribitsExampleProject/PackagesList.cmake"
+      "Reading list of native TPLs from .*/TribitsExampleProject/TPLsList.cmake"
+      "Reading list of POST extra packages from .*/TribitsExampleProject/TribitsExampleProjectAddons/PackagesList.cmake"
+      "Reading list of POST extra TPLs from .*/TribitsExampleProject/TribitsExampleProjectAddons/TPLsList.cmake"
       "Final set of enabled SE packages:  SimpleCxx .* Addon1"
       "Processing enabled package: SimpleCxx [(]Libs, Tests, Examples[)]"
       "Processing enabled package: Addon1 [(]Libs, Tests, Examples[)]"
@@ -1664,10 +1664,10 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProject_TribitsExampleProjectAddons
       .
     PASS_REGULAR_EXPRESSION_ALL
       "Processing list of POST extra repos from TribitsExProj_EXTRA_REPOSITORIES='TribitsExampleProjectAddons'"
-      "Reading the list of packages from .*/TribitsExampleProject/PackagesList.cmake"
-      "Reading the list of TPLs from .*/TribitsExampleProject/TPLsList.cmake"
-      "Reading a list of extra packages from .*/TribitsExampleProject/TribitsExampleProjectAddons/PackagesList.cmake"
-      "Reading a list of extra TPLs from .*/TribitsExampleProject/TribitsExampleProjectAddons/TPLsList.cmake"
+      "Reading list of native packages from .*/TribitsExampleProject/PackagesList.cmake"
+      "Reading list of native TPLs from .*/TribitsExampleProject/TPLsList.cmake"
+      "Reading list of POST extra packages from .*/TribitsExampleProject/TribitsExampleProjectAddons/PackagesList.cmake"
+      "Reading list of POST extra TPLs from .*/TribitsExampleProject/TribitsExampleProjectAddons/TPLsList.cmake"
       "Final set of enabled SE packages:  SimpleCxx .* Addon1"
       "Processing enabled package: SimpleCxx [(]Libs, Tests, Examples[)]"
       "Processing enabled package: Addon1 [(]Libs, Tests, Examples[)]"
@@ -1722,10 +1722,10 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProjectAddons
     PASS_REGULAR_EXPRESSION_ALL
       "Reading the list of extra repositories from cmake/ExtraRepositoriesList.cmake"
       "-- Adding PRE extra Continuous repository TribitsExampleProject "
-      "Reading a list of extra packages from .*/TribitsExampleProjectAddons/TribitsExampleProject/PackagesList.cmake"
-      "Reading a list of extra TPLs from .*/TribitsExampleProjectAddons/TribitsExampleProject/TPLsList.cmake"
-      "Reading the list of packages from .*/TribitsExampleProjectAddons/PackagesList.cmake"
-      "Reading the list of TPLs from .*/TribitsExampleProjectAddons/TPLsList.cmake"
+      "Reading list of PRE extra packages from .*/TribitsExampleProjectAddons/TribitsExampleProject/PackagesList.cmake"
+      "Reading list of PRE extra TPLs from .*/TribitsExampleProjectAddons/TribitsExampleProject/TPLsList.cmake"
+      "Reading list of native packages from .*/TribitsExampleProjectAddons/PackagesList.cmake"
+      "Reading list of native TPLs from .*/TribitsExampleProjectAddons/TPLsList.cmake"
       "Final set of enabled SE packages:  SimpleCxx .* Addon1"
       "Processing enabled package: SimpleCxx [(]Libs, Tests, Examples[)]"
       "Processing enabled package: Addon1 [(]Libs, Tests, Examples[)]"
@@ -1756,10 +1756,10 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProjectAddons
       .
     PASS_REGULAR_EXPRESSION_ALL
       "Processing list of PRE extra repos from TribitsExProjAddons_PRE_REPOSITORIES='TribitsExampleProject'"
-      "Reading a list of extra packages from .*/TribitsExampleProjectAddons/TribitsExampleProject/PackagesList.cmake"
-      "Reading a list of extra TPLs from .*/TribitsExampleProjectAddons/TribitsExampleProject/TPLsList.cmake"
-      "Reading the list of packages from .*/TribitsExampleProjectAddons/PackagesList.cmake"
-      "Reading the list of TPLs from .*/TribitsExampleProjectAddons/TPLsList.cmake"
+      "Reading list of PRE extra packages from .*/TribitsExampleProjectAddons/TribitsExampleProject/PackagesList.cmake"
+      "Reading list of PRE extra TPLs from .*/TribitsExampleProjectAddons/TribitsExampleProject/TPLsList.cmake"
+      "Reading list of native packages from .*/TribitsExampleProjectAddons/PackagesList.cmake"
+      "Reading list of native TPLs from .*/TribitsExampleProjectAddons/TPLsList.cmake"
       "Final set of enabled SE packages:  SimpleCxx .* Addon1"
       "Processing enabled package: SimpleCxx [(]Libs, Tests, Examples[)]"
       "Processing enabled package: Addon1 [(]Libs, Tests, Examples[)]"

diff --git a/test/ctest_driver/CMakeLists.txt b/test/ctest_driver/CMakeLists.txt
@@ -367,7 +367,7 @@ CREATE_CTEST_DEPENDENCY_HANDLING_TEST_CASE(
     "Adding POST extra Continuous repository Dakota"
     "Trilinos_NUM_PACKAGES='24'"
     "Trilinos_NUM_TPLS='19'"
-    "Reading a list of extra packages from .*/MockTrilinos/preCopyrightTrilinos/PackagesList.cmake"
+    "Reading list of POST extra packages from .*/MockTrilinos/preCopyrightTrilinos/PackagesList.cmake"
     "Trilinos_NUM_PACKAGES='26'"
     "Trilinos_NUM_TPLS='20'"
     "Skipping reading packages and TPLs for extra repo Dakota because marked NOPACKAGES"

diff --git a/tribits/core/package_arch/TribitsGlobalMacros.cmake b/tribits/core/package_arch/TribitsGlobalMacros.cmake
@@ -1205,19 +1205,19 @@ MACRO(TRIBITS_READ_EXTRA_REPOSITORIES_LISTS)
       ENDIF()
 
       MESSAGE("")
-      MESSAGE("Reading a list of extra packages from ${EXTRAREPO_PACKAGES_FILE} ... ")
+      MESSAGE("Reading list of ${READ_PRE_OR_POST_EXRAREPOS} extra packages from ${EXTRAREPO_PACKAGES_FILE} ... ")
       MESSAGE("")
 
       IF (NOT EXISTS "${EXTRAREPO_PACKAGES_FILE}")
         IF (${PROJECT_NAME}_IGNORE_MISSING_EXTRA_REPOSITORIES)
           MESSAGE(
             "\n***"
-            "\n*** WARNING!  Ignoring missing extra repo '${EXTRA_REPO}' packages list file '${EXTRAREPO_PACKAGES_FILE}' on request!"
+            "\n*** WARNING!  Ignoring missing ${READ_PRE_OR_POST_EXRAREPOS} extra repo '${EXTRA_REPO}' packages list file '${EXTRAREPO_PACKAGES_FILE}' on request!"
             "\n***\n")
             # ToDo: TriBITS:73: Shorten above message to just one line
         ELSE()
           MESSAGE( SEND_ERROR
-            "ERROR: Skipping missing extra repo '${EXTRA_REPO}' packages list file '${EXTRAREPO_PACKAGES_FILE}'!")
+            "ERROR: Skipping missing ${READ_PRE_OR_POST_EXRAREPOS} extra repo '${EXTRA_REPO}' packages list file '${EXTRAREPO_PACKAGES_FILE}'!")
           # ToDo: TriBITS:73: Change to FATAL_ERROR to abort early
         ENDIF()
       ELSE()
@@ -1234,19 +1234,19 @@ MACRO(TRIBITS_READ_EXTRA_REPOSITORIES_LISTS)
         "${${EXTRA_REPO}_SOURCE_DIR}/${${PROJECT_NAME}_EXTRA_TPLS_FILE_NAME}")
 
       MESSAGE("")
-      MESSAGE("Reading a list of extra TPLs from ${${EXTRA_REPO}_TPLS_FILE} ... ")
+      MESSAGE("Reading list of ${READ_PRE_OR_POST_EXRAREPOS} extra TPLs from ${${EXTRA_REPO}_TPLS_FILE} ... ")
       MESSAGE("")
 
       IF (NOT EXISTS "${${EXTRA_REPO}_TPLS_FILE}")
         IF (${PROJECT_NAME}_IGNORE_MISSING_EXTRA_REPOSITORIES)
           MESSAGE(
             "\n***"
-            "\n*** WARNING!  Ignoring missing extra repo '${EXTRA_REPO}' TPLs list file '${${EXTRA_REPO}_TPLS_FILE}' on request!"
+            "\n*** WARNING!  Ignoring missing ${READ_PRE_OR_POST_EXRAREPOS} extra repo '${EXTRA_REPO}' TPLs list file '${${EXTRA_REPO}_TPLS_FILE}' on request!"
             "\n***\n")
           # ToDo: TriBITS:73: Shorten above warning to just one line
         ELSE()
           MESSAGE( SEND_ERROR
-            "ERROR: Skipping missing extra repo '${EXTRA_REPO}' TPLs list file '${${EXTRA_REPO}_TPLS_FILE}'!")
+            "ERROR: Skipping missing ${READ_PRE_OR_POST_EXRAREPOS} extra repo '${EXTRA_REPO}' TPLs list file '${${EXTRA_REPO}_TPLS_FILE}'!")
         ENDIF()
       ELSE()
         TRIBITS_TRACE_FILE_PROCESSING(REPOSITORY  INCLUDE  "${${EXTRA_REPO}_TPLS_FILE}")
@@ -1322,7 +1322,7 @@ MACRO(TRIBITS_READ_PACKAGES_PROCESS_DEPENDENCIES_WRITE_XML)
     ENDIF()
 
     MESSAGE("")
-    MESSAGE("Reading the list of packages from ${${NATIVE_REPO_NAME}_PACKAGES_FILE}")
+    MESSAGE("Reading list of native packages from ${${NATIVE_REPO_NAME}_PACKAGES_FILE}")
     MESSAGE("")
 
     IF (NATIVE_REPO STREQUAL ".")
@@ -1342,7 +1342,7 @@ MACRO(TRIBITS_READ_PACKAGES_PROCESS_DEPENDENCIES_WRITE_XML)
       "${${NATIVE_REPO_NAME}_SOURCE_DIR}/${${PROJECT_NAME}_TPLS_FILE_NAME}")
 
     MESSAGE("")
-    MESSAGE("Reading the list of TPLs from ${${NATIVE_REPO_NAME}_TPLS_FILE}")
+    MESSAGE("Reading list of native TPLs from ${${NATIVE_REPO_NAME}_TPLS_FILE}")
     MESSAGE("")
 
     TRIBITS_TRACE_FILE_PROCESSING(REPOSITORY  INCLUDE