From bad293d70d022628d8d23ba70822b8696340e41c Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 19 Sep 2023 11:00:39 -0600 Subject: [PATCH] Fix spelling of package1ConfigRegex (#582) Caught by @KyleFromKitware --- .../TribitsExampleProject2_Tests.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake index 4f485a1cb..9a713619f 100644 --- a/test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake +++ b/test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake @@ -555,11 +555,11 @@ function(TribitsExampleProject2_find_package sharedOrStatic package1TribitsOrR ) set(package1UseRawCMakeArgs "") set(testNameSuffix "") - set(package1ConfiRegex "Configuring package Package1 as full TriBITS package") + set(package1ConfigRegex "Configuring package Package1 as full TriBITS package") elseif (package1TribitsOrRawCMake STREQUAL "PACKAGE1_USE_RAW_CMAKE") set(package1UseRawCMakeArgs "-D Package1_USE_RAW_CMAKE=TRUE") set(testNameSuffix "_${package1TribitsOrRawCMake}") - set(package1ConfiRegex "Configuring raw CMake package Package1") + set(package1ConfigRegex "Configuring raw CMake package Package1") else() message(FATAL_ERROR "package1UseRawCMakeArgs='${package1UseRawCMakeArgs}' Invalid!") endif() @@ -570,12 +570,12 @@ function(TribitsExampleProject2_find_package sharedOrStatic package1TribitsOrR "-D Package1_USE_TRIBITS_TEST_FUNCTIONS=TRUE" "-D Package1_TRACE_ADD_TEST=TRUE" ) string(APPEND testNameSuffix "_${package1UseTribitsTestFunctions}" ) - list(APPEND package1ConfiRegex + list(APPEND package1ConfigRegex "Using TriBITS Test Functions in raw CMake Package1 build" "Package1_Prg: Added test [(]BASIC, PROCESSORS=1[)]" "Package1_Prg-advanced: Added test [(]BASIC, PROCESSORS=1[)]" ) elseif (package1UseTribitsTestFunctions STREQUAL "") - list(APPEND package1ConfiRegex + list(APPEND package1ConfigRegex "Using Raw CMake add_test[(][)] in raw CMake Package1 build" ) else() message(FATAL_ERROR @@ -635,7 +635,7 @@ function(TribitsExampleProject2_find_package sharedOrStatic package1TribitsOrR "-- Generating Tpl3::all_libs and Tpl3Config.cmake" "-- Found Tpl4_DIR='.*TribitsExampleProject2_Tpls_install_${sharedOrStatic}/install_tpl4/lib/cmake/Tpl4'" "-- Generating Tpl4::all_libs and Tpl4Config.cmake" - "${package1ConfiRegex}" + "${package1ConfigRegex}" "-- Configuring done" "-- Generating done" ALWAYS_FAIL_ON_NONZERO_RETURN @@ -1224,13 +1224,13 @@ function(TribitsExampleProject2_External_RawPackage1_PBP "-D Package1_TRIBITS_DIR=${${PROJECT_NAME}_TRIBITS_DIR}" "-D Package1_TRACE_ADD_TEST=TRUE" ) string(APPEND testNameSuffix "_${package1UseTribitsTestFunctions}" ) - set(package1ConfiRegex + set(package1ConfigRegex "Using TriBITS Test Functions in raw CMake Package1 build" "Package1_Prg: Added test [(]BASIC, PROCESSORS=1[)]" "Package1_Prg-advanced: Added test [(]BASIC, PROCESSORS=1[)]" ) elseif (package1UseTribitsTestFunctions STREQUAL "") set(package1UseTribitsTestFunctionsArgs "") - set(package1ConfiRegex + set(package1ConfigRegex "Using Raw CMake add_test[(][)] in raw CMake Package1 build" ) else() message(FATAL_ERROR @@ -1265,7 +1265,7 @@ function(TribitsExampleProject2_External_RawPackage1_PBP ../TribitsExampleProject2/packages/package1 PASS_REGULAR_EXPRESSION_ALL "Configuring raw CMake project Package1" - "${package1ConfiRegex}" + "${package1ConfigRegex}" "-- Configuring done" "-- Generating done" ALWAYS_FAIL_ON_NONZERO_RETURN