@@ -43,7 +43,7 @@ for shell in ${SHELLS[@]}; do
4343
4444 # TEST 1: Source Script and check Module Output
4545 expected_pattern=" .*EESSI has selected $EESSI_SOFTWARE_SUBDIR_OVERRIDE as the compatible CPU target for EESSI/$EESSI_VERSION .*"
46- assert_raises " $shell -c 'source init/lmod/$shell ' 2>&1 | grep -E \" ${expected_pattern} \" "
46+ assert_raises " $shell -c '. init/lmod/$shell ' 2>&1 | grep -E \" ${expected_pattern} \" "
4747
4848 # TEST 2: Check if module overviews first section is the loaded EESSI module
4949 if [ " $shell " = " csh" ]; then
@@ -53,7 +53,7 @@ for shell in ${SHELLS[@]}; do
5353 echo " source init/lmod/$shell " > ~ /.cshrc
5454 MODULE_SECTIONS=($( $shell -c " module ov" 2>&1 | grep -e ' ---' ) )
5555 else
56- MODULE_SECTIONS=($( $shell -c " source init/lmod/$shell >/dev/null 2>&1; module ov 2>&1 | grep -e '---'" ) )
56+ MODULE_SECTIONS=($( $shell -c " . init/lmod/$shell >/dev/null 2>&1; module ov 2>&1 | grep -e '---'" ) )
5757 fi
5858 PATTERN=" /cvmfs/software\.eessi\.io/versions/$EESSI_VERSION /software/linux/$EESSI_SOFTWARE_SUBDIR_OVERRIDE /modules/all"
5959 assert_raises ' echo "${MODULE_SECTIONS[1]}" | grep -E "$PATTERN"'
@@ -68,7 +68,7 @@ for shell in ${SHELLS[@]}; do
6868 echo " source init/lmod/$shell " > ~ /.cshrc
6969 command=" $shell -c 'module load EasyBuild/${EXPECTED_EASYBUILD_VERSION} ; eb --version' | tail -n 1 | awk '{print \$ 4}'"
7070 else
71- command=" $shell -c 'source init/lmod/$shell >/dev/null 2>&1; module load EasyBuild/${EXPECTED_EASYBUILD_VERSION} ; eb --version' | tail -n 1 | awk '{print \$ 4}'"
71+ command=" $shell -c '. init/lmod/$shell >/dev/null 2>&1; module load EasyBuild/${EXPECTED_EASYBUILD_VERSION} ; eb --version' | tail -n 1 | awk '{print \$ 4}'"
7272 fi
7373 assert " $command " " $EXPECTED_EASYBUILD_VERSION "
7474
@@ -77,7 +77,7 @@ for shell in ${SHELLS[@]}; do
7777 echo " source init/lmod/$shell " > ~ /.cshrc
7878 EASYBUILD_PATH=$( $shell -c " module load EasyBuild/${EXPECTED_EASYBUILD_VERSION} ; which eb" )
7979 else
80- EASYBUILD_PATH=$( $shell -c " source init/lmod/$shell 2>/dev/null; module load EasyBuild/${EXPECTED_EASYBUILD_VERSION} ; which eb" )
80+ EASYBUILD_PATH=$( $shell -c " . init/lmod/$shell 2>/dev/null; module load EasyBuild/${EXPECTED_EASYBUILD_VERSION} ; which eb" )
8181 fi
8282 # escape the dots in ${EASYBUILD_VERSION}
8383 PATTERN=" /cvmfs/software\.eessi\.io/versions/$EESSI_VERSION /software/linux/$EESSI_SOFTWARE_SUBDIR_OVERRIDE /software/EasyBuild/${EXPECTED_EASYBUILD_VERSION// ./ \\ .} /bin/eb"
@@ -124,10 +124,10 @@ for shell in ${SHELLS[@]}; do
124124 TEST_EESSI_WITHOUT_PURGE=$( $shell -c ' echo $EESSI_NO_MODULE_PURGE_ON_INIT' )
125125 elif [ " $shell " = " fish" ]; then
126126 TEST_EESSI_WITH_PURGE=$( $shell -c " source $LMOD_PKG /init/$shell 2>/dev/null ; source init/lmod/$shell 2>/dev/null" )
127- TEST_EESSI_WITHOUT_PURGE=$( $shell -c " set -x EESSI_NO_MODULE_PURGE_ON_INIT 1 ; source $LMOD_PKG /init/$shell 2>/dev/null ; source init/lmod/$shell 2>/dev/null" )
127+ TEST_EESSI_WITHOUT_PURGE=$( $shell -c " set -x EESSI_NO_MODULE_PURGE_ON_INIT 1 ; source $LMOD_PKG /init/$shell 2>/dev/null ; . init/lmod/$shell 2>/dev/null" )
128128 else
129- TEST_EESSI_WITH_PURGE=$( $shell -c " source $LMOD_PKG /init/$shell 2>/dev/null ; source init/lmod/$shell 2>/dev/null" )
130- TEST_EESSI_WITHOUT_PURGE=$( $shell -c " export EESSI_NO_MODULE_PURGE_ON_INIT=1 ; source $LMOD_PKG /init/$shell 2>/dev/null ; source init/lmod/$shell 2>/dev/null" )
129+ TEST_EESSI_WITH_PURGE=$( $shell -c " . $LMOD_PKG /init/$shell 2>/dev/null ; . init/lmod/$shell 2>/dev/null" )
130+ TEST_EESSI_WITHOUT_PURGE=$( $shell -c " export EESSI_NO_MODULE_PURGE_ON_INIT=1 ; . $LMOD_PKG /init/$shell 2>/dev/null ; . init/lmod/$shell 2>/dev/null" )
131131 fi
132132 # In the first case we should have the test and in the second case we shouldn't
133133 pattern=" Modules purged before initialising EESSI"
@@ -141,8 +141,8 @@ for shell in ${SHELLS[@]}; do
141141 # Optional test 10, check if the prompt has been updated
142142 if [ " $shell " = " bash" ] || [ " $shell " = " ksh" ] || [ " $shell " = " zsh" ] || [ " $shell " = " sh" ]; then
143143 # Typically this is a non-interactive shell, so manually unset PS1 and reset to a non-exported variable when testing
144- TEST_EESSI_PS1_UPDATE=$( $shell -c " unset PS1 ; PS1='$ ' ; source init/lmod/$shell 2>/dev/null ; echo \"\$ PS1\" " )
145- TEST_EESSI_NO_PS1_UPDATE=$( $shell -c " unset PS1 ; source init/lmod/$shell 2>/dev/null ; echo \"\$ PS1\" " )
144+ TEST_EESSI_PS1_UPDATE=$( $shell -c " unset PS1 ; PS1='$ ' ; . init/lmod/$shell 2>/dev/null ; echo \"\$ PS1\" " )
145+ TEST_EESSI_NO_PS1_UPDATE=$( $shell -c " unset PS1 ; . init/lmod/$shell 2>/dev/null ; echo \"\$ PS1\" " )
146146 pattern=" {EESSI/${EESSI_VERSION} } "
147147 assert_raises ' echo "$TEST_EESSI_PS1_UPDATE" | grep "$pattern"'
148148 assert_raises ' echo "$TEST_EESSI_NO_PS1_UPDATE" | grep "$pattern"' 1
0 commit comments