diff --git a/run_tests.sh b/run_tests.sh index 76558f72..21cea0b2 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -20,7 +20,7 @@ source ${base_dir}/init/eessi_defaults # Make sure we clone the latest version. This assumes versions are of the format "v1.2.3", then picks the latest # then checks it out TEST_CLONE="git clone https://github.com/EESSI/test-suite EESSI-test-suite && cd EESSI-test-suite" -LATEST_VERSION="VERSION=\$(git tag | grep '^v[0-9]\+\.[0-9]\+\.[0-9]\+$' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n 1)" +LATEST_VERSION="VERSION=\$(git tag --list 'v*' | sort -V | tail -n1)" CHECKOUT_LATEST="git checkout \${VERSION}" # Git clone has to be run in compat layer, to make the git command available diff --git a/test_suite.sh b/test_suite.sh index be66eaa3..c7cf591a 100755 --- a/test_suite.sh +++ b/test_suite.sh @@ -108,15 +108,6 @@ else python3 -V fi -# Check that ReFrame can be imported -reframe_import="reframe" -python3 -c "import ${reframe_import}" -if [[ $? -eq 0 ]]; then - echo_green "Succesfully found and imported ${reframe_import}" -else - fatal_error "Failed to import ${reframe_import}" -fi - # Cloning should already be done in run_tests.sh before test_suite.sh is invoked # Check if that succeeded export TESTSUITEPREFIX=$PWD/EESSI-test-suite