Change field tests from a hard-coded path to a dynamic one

Author: StuntsPT

.gitlab-ci.yml

@@ -29,7 +29,6 @@ tests:
       - pip install pytest
       - pip install .
       - pytest tests/*.py -v
-      - which structure_threader
       - tests/structure_field_test.sh
       - tests/fastStructure_field_test.sh
       - tests/maverick_field_test.sh

tests/fastStructure_field_test.sh

@@ -24,8 +24,9 @@ echo "Runnig fastStructure 'field test'. This will simulate a full wrapped run o
 
 git_dir=$(pwd)
 str_bin=$(which fastStructure)
+structure_threader_exec=$(which structure_threader)
 
 tar xvfJ ${git_dir}/tests/smalldata/BigTestData.str.tar.xz -C ${git_dir}/tests/smalldata/
-~/virtualenv/python3.5/bin/structure_threader run -i ${git_dir}/tests/smalldata/BigTestData.str -o ~/results_fs -fs ${str_bin} -K 4 -t 4 --ind ${git_dir}/tests/smalldata/indfile.txt
+${structure_threader_exec} run -i ${git_dir}/tests/smalldata/BigTestData.str -o ~/results_fs -fs ${str_bin} -K 4 -t 4 --ind ${git_dir}/tests/smalldata/indfile.txt
 
 echo -e "${LightGreen}fastStructure 'Field test' ran successfully. Yay!${NoColor}"

tests/maverick_field_test.sh

@@ -24,7 +24,8 @@ echo "Runnig MavericK 'field test'. This will simulate a full wrapped run on sma
 
 git_dir=$(pwd)
 maverick_bin=$(which MavericK)
+structure_threader_exec=$(which structure_threader)
 
-~/virtualenv/python3.5/bin/structure_threader run -i ${git_dir}/tests/smalldata/Reduced_dataset.structure -o ~/results -mv ${maverick_bin} -K 3 -t 4 --params ${git_dir}/tests/smalldata/parameters.txt
+${structure_threader_exec} run -i ${git_dir}/tests/smalldata/Reduced_dataset.structure -o ~/results -mv ${maverick_bin} -K 3 -t 4 --params ${git_dir}/tests/smalldata/parameters.txt
 
 echo -e "${LightGreen}MavericK 'Field test' ran successfully. Yay!${NoColor}"

tests/structure_field_test.sh

@@ -24,7 +24,8 @@ echo "Runnig STRUCTURE 'field test'. This will simulate a full wrapped run on sm
 
 git_dir=$(pwd)
 str_bin=$(which structure)
+structure_threader_exec=$(which structure_threader)
 
-~/virtualenv/python3.5/bin/structure_threader run -i ${git_dir}/tests/smalldata/Reduced_dataset.structure -o ~/results -st ${str_bin} -K 3 -t 4 -R 5 --params ${git_dir}/tests/smalldata/mainparams
+${structure_threader_exec} run -i ${git_dir}/tests/smalldata/Reduced_dataset.structure -o ~/results -st ${str_bin} -K 3 -t 4 -R 5 --params ${git_dir}/tests/smalldata/mainparams
 
 echo -e "${LightGreen}STRUCTURE 'Field test' ran successfully. Yay!${NoColor}"