Amended relative paths of several files. #66.

Author: Hatim Chahout

tests/run_test_setup.bash

@@ -17,10 +17,12 @@ function setup_test_env() {
   export TMP_DIR=$(mktemp -d)
   export PARAMS="../param.bash"
 
-  cp ./run_proc.bash run_proc_orig.bash
-  sed '/moo_wait() {/,/^}/d; /slurm_wait() {/,/^}/d; /retrieve_data() {/,/^}/d; /run_tool() {/,/^}/d' "run_proc_orig.bash" > "run_proc.bash"
-  # echo "Contents of run_proc.bash:"
-  # cat run_proc.bash
+  if [ ! -f ../run_proc_orig.bash ]; then
+    mv ../run_proc.bash ../run_proc_orig.bash
+  fi
+  sed '/moo_wait() {/,/^}/d; /slurm_wait() {/,/^}/d; /retrieve_data() {/,/^}/d; /run_tool() {/,/^}/d' "../run_proc_orig.bash" > "../run_proc.bash"
+  echo "Contents of run_proc.bash:"
+  cat ../run_proc.bash
 
   # Create an empty param.bash and add the mock paths to it
   > "$PARAMS"

tests/run_tests.bash

@@ -3,39 +3,39 @@
 set -ex
 
 # Source the common setup script
-source ./tests/run_test_setup.bash
+source ./run_test_setup.bash
 
 echo "Running all integration tests..."
 
 # Test 1: A valid, simple run
 echo ""
 echo "-------------------------------------"
 echo "Running test_valid_run.bash"
-./tests/test_valid_run.bash
+./test_valid_run.bash
 
 # Test 2: Test with missing dependencies
 echo ""
 echo "-------------------------------------"
 echo "Running test_missing_deps.bash"
-./tests/test_missing_deps.bash
+./test_missing_deps.bash
 
 # Test 3: Test with user choices for Southern Ocean
 echo ""
 echo "-------------------------------------"
 echo "Running test_user_choices.bash"
-./tests/test_user_choices.bash
+./test_user_choices.bash
 
 # Test 4: Test with missing arguments
 echo ""
 echo "-------------------------------------"
 echo "Running test_missing_args.bash"
-./tests/test_missing_args.bash
+./test_missing_args.bash
 
 # Test 5: Test with missing or invalid file paths
 echo ""
 echo "-------------------------------------"
 echo "Running test_invalid_paths.bash"
-./tests/test_invalid_paths.bash
+./test_invalid_paths.bash
 
 echo ""
 echo "-------------------------------------"

tests/test_valid_run.bash

@@ -4,7 +4,7 @@ set -ex
 echo "--- Test 1: A valid run ---"
 
 echo "Sourcing setup script..."
-source ./tests/run_test_setup.bash
+source ./run_test_setup.bash
 
 echo "Setting up test environment..."
 setup_test_env
@@ -15,7 +15,7 @@ setup_test_env
 JOBOUT="$TMP_DIR/test_valid_run_out.txt"
 
 echo "Running the process with valid parameters..."
-source ./run_proc.bash -B bathy.nc -C 1 mesh_mask.nc 2020 2020 1m RUNID_TEST > "$JOBOUT" 2>&1
+source ../run_proc.bash -B bathy.nc -C 1 mesh_mask.nc 2020 2020 1m RUNID_TEST > "$JOBOUT" 2>&1
 
 # { source ./run_proc.bash -B bathy.nc -C 1 mesh_mask.nc 2020 2020 1m RUNID_TEST; } > "$JOBOUT" 2>&1