From cf6f3670a3b0466c1f929bb96d21700dbb347b5d Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <stevenng@met.no>
Date: Wed, 19 Feb 2025 11:34:59 +0100
Subject: [PATCH] Clean test, add to workflow

---
 .github/workflows/capgen_unit_tests.yaml                  | 3 ++-
 test/test_fortran_to_metadata.sh                          | 8 ++++----
 .../sample_files}/test_fortran_to_metadata.F90            | 0
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename test/{ => unit_tests/sample_files}/test_fortran_to_metadata.F90 (100%)

diff --git a/.github/workflows/capgen_unit_tests.yaml b/.github/workflows/capgen_unit_tests.yaml
index 820553af..4d871a52 100644
--- a/.github/workflows/capgen_unit_tests.yaml
+++ b/.github/workflows/capgen_unit_tests.yaml
@@ -18,4 +18,5 @@ jobs:
       run: sudo apt-get update && sudo apt-get install -y build-essential ${{matrix.fortran-compiler}} cmake python3 git libxml2-utils
     - name: Run unit tests
       run: cd test && ./run_fortran_tests.sh
-
+    - name: Run Fortran to metadata test
+      run: cd test && ./test_fortran_to_metadata.sh
diff --git a/test/test_fortran_to_metadata.sh b/test/test_fortran_to_metadata.sh
index ac475994..adedaac6 100755
--- a/test/test_fortran_to_metadata.sh
+++ b/test/test_fortran_to_metadata.sh
@@ -1,14 +1,14 @@
 #! /bin/bash
 
 ## Relevant directories and file paths
-test_dir="$(dirname ${0})"
+test_dir="$(cd $(dirname ${0}); pwd -P)"
 script_dir="$(dirname ${test_dir})/scripts"
+sample_files_dir="${test_dir}/unit_tests/sample_files"
 f2m_script="${script_dir}/ccpp_fortran_to_metadata.py"
 filename="test_fortran_to_metadata"
-test_input="${test_dir}/${filename}.F90"
+test_input="${sample_files_dir}/${filename}.F90"
 tmp_dir="${test_dir}/unit_tests/tmp"
-sample_files="${test_dir}/unit_tests/sample_files"
-sample_meta="${sample_files}/check_fortran_to_metadata.meta"
+sample_meta="${sample_files_dir}/check_fortran_to_metadata.meta"
 
 # Run the script
 opts="--ddt-names serling_t"
diff --git a/test/test_fortran_to_metadata.F90 b/test/unit_tests/sample_files/test_fortran_to_metadata.F90
similarity index 100%
rename from test/test_fortran_to_metadata.F90
rename to test/unit_tests/sample_files/test_fortran_to_metadata.F90