ATDM/utils: Fix unit tests

trilinos · Jun 11, 2020 · d339119 · d339119
1 parent 6a2d80e
commit d339119
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cmake/std/atdm/utils/get_known_system_info.sh b/cmake/std/atdm/utils/get_known_system_info.sh
@@ -43,6 +43,7 @@ if [[ "${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTIN
     echo
   fi
   realHostname=${ATDM_CONFIG_GET_KNOW_SYSTEM_INFO_REAL_HOSTNAME_OVERRIDE_FOR_UNIT_TESTING}
+  hostNameOverride=true
 fi
 #echo "Hostname = '$realHostname'"
 
@@ -178,7 +179,8 @@ elif [[ "${SNLSYSTEM}" == "astra" || \
         "${SNLSYSTEM}" == "vortex" ]] ; then
   echo "Don't call get-platform on 'astra' systems" > /dev/null
   # Above logic avoids an 'ERROR: Unrecognized cluster <name>' on these systems
-elif [[ -f /projects/sems/modulefiles/utils/get-platform ]] ; then
+elif [[ -f /projects/sems/modulefiles/utils/get-platform &&
+        -z $hostNameOverride ]] ; then
   ATDM_SYSTEM_NAME=`source /projects/sems/modulefiles/utils/get-platform`
   if [[ $ATDM_SYSTEM_NAME == "rhel6-x86_64" ]] ; then
     systemNameTypeMatchedList+=(sems-rhel6)

diff --git a/cmake/std/atdm/utils/util_unit_tests.sh b/cmake/std/atdm/utils/util_unit_tests.sh
@@ -21,6 +21,10 @@ test_atdm_get_known_system_info() {
   # Get the good ATDM_KNOWN_SYSTEM_NAMES_LIST
   ATDM_CONFIG_BUILD_NAME=unit_test
   ATDM_CONFIG_DISABLE_WARNINGS=ON
+  SNLSYSTEM=
+  SEMS_PLATFORM=
+  ATDM_SYSTEM_NAME=
+  SNLCLUSTER=
   source ${ATDM_UTIL_SCRIPT_GET_KNOWN_SYSTEM_INFO}
 
   # Check that all known system names pass