Add first fuller PRE extra repo test (SQUASH ME) (TriBITS TriBITSPub#73)

This test shows that PRE extra repos are read in correctly and their packages are placed in the correct order.
bartlettroscoe · Jun 3, 2015 · a34d49c · a34d49c
1 parent 5fa5fc5
commit a34d49c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/test/core/DependencyUnitTests/CMakeLists.txt b/test/core/DependencyUnitTests/CMakeLists.txt
@@ -1024,6 +1024,25 @@ CREATE_DEPENDENCY_HANDLING_TEST_CASE(
   )
 
 
+CREATE_DEPENDENCY_HANDLING_TEST_CASE(
+  PreAndExtraReposFile_EnableAllPackages
+  ARGS 
+    -DTrilinos_EXTRAREPOS_FILE=${CMAKE_CURRENT_SOURCE_DIR}/PreAndExtraRepositoriesList.cmake
+    -DTrilinos_ENABLE_KNOWN_EXTERNAL_REPOS_TYPE=Nightly
+    -DTrilinos_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON
+    -DTrilinos_IGNORE_MISSING_EXTRA_REPOSITORIES=TRUE
+    -DTrilinos_ENABLE_ALL_PACKAGES=ON
+  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"
+    "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
+# their packages are listed before packages in the native project.
+
+
 CREATE_DEPENDENCY_HANDLING_TEST_CASE(
   preCopyrightTrilinos_EnableStalix
   ARGS -DTrilinos_EXTRA_REPOSITORIES=preCopyrightTrilinos

diff --git a/test/core/DependencyUnitTests/PreAndExtraRepositoriesList.cmake b/test/core/DependencyUnitTests/PreAndExtraRepositoriesList.cmake
@@ -0,0 +1,6 @@
+TRIBITS_PROJECT_DEFINE_EXTRA_REPOSITORIES(
+  preRepoOnePackage      ""  GIT  url1:/git/preRepoOnePackage  "PRE"   Continuous
+  preCopyrightTrilinos   ""  GIT  url1:/git/preCopyrightTrilinos  ""   Continuous
+  extraTrilinosRepo      ""  GIT  usr2:/git/extraTrilinosRepo     ""   Nightly
+  Dakota  packages/TriKota/Dakota  SVN  url3/somedirpath/trunk  NOPACKAGES  Continuous
+  )
diff --git a/tribits/examples/MockTrilinos/preRepoOnePackage/PackagesList.cmake b/tribits/examples/MockTrilinos/preRepoOnePackage/PackagesList.cmake
@@ -0,0 +1,3 @@
+TRIBITS_REPOSITORY_DEFINE_PACKAGES(
+  preRepoOnePackage   .     PT
+  )
diff --git a/tribits/examples/MockTrilinos/preRepoOnePackage/TPLsList.cmake b/tribits/examples/MockTrilinos/preRepoOnePackage/TPLsList.cmake
@@ -0,0 +1 @@
+TRIBITS_REPOSITORY_DEFINE_TPLS()
diff --git a/tribits/examples/MockTrilinos/preRepoOnePackage/cmake/Dependencies.cmake b/tribits/examples/MockTrilinos/preRepoOnePackage/cmake/Dependencies.cmake
@@ -0,0 +1 @@
+TRIBITS_PACKAGE_DEFINE_DEPENDENCIES()