chore: cleanup cdm unit test scripts

Author: dschwartz-ftadvisory

docs/PR.md

@@ -21,7 +21,7 @@ This PR delivers comprehensive function and expression generation support
    - Closed gaps and resolved issues in the handling of inheritance and attributes.
 
 4. **Significant load performance improvement**
-   - Load time reduced by approximately 85% (~120 s → ~15 s).
+   - Load time reduced by approximately 98% (~120 s → ~2 s).
    - Mutually recursive elements partitioned into a small cyclic bundle (~6% of CDM types) with the remainder emitted as standalone files
 
 5. **Completion of support for Type Aliases** — type aliases are resolved with flattened naming conventions and collision handling.

python-test/cdm-tests/run_cdm_tests.sh

@@ -18,8 +18,7 @@ cd ${MY_PATH} || error
 PROJECT_ROOT_PATH="$MY_PATH/../.."
 PYTHON_SETUP_PATH="$MY_PATH/../env-setup"
 
-
-source "$MY_PATH/../common.sh" || { echo "Failed to source common.sh"; exit 1; }
+source "$MY_PATH/../ensure_jar_exists.sh" || { echo "Failed to source ensure_jar_exists.sh"; exit 1; }
 
 
 usage() {
@@ -87,12 +86,16 @@ fi
 
 echo "***** setting up common environment"
 # source $PYTHON_SETUP_PATH/setup_python_env.sh # Called by setup_cdm_test_env.sh
-source $MY_PATH/setup_cdm_test_env.sh || error
+_SAVED_MY_PATH="$MY_PATH"
+source $MY_PATH/setup/setup_cdm_test_env.sh || error
+MY_PATH="$_SAVED_MY_PATH"
+unset _SAVED_MY_PATH
 
 
 # run tests — venv is active at this point; use bare 'python' so the venv's
 # interpreter is used, not the system python path cached in $PYEXE
 echo "***** run tests"
+echo $MY_PATH
 python -m pip install pytest
 python -m pytest -p no:cacheprovider $MY_PATH
 TEST_EXIT_CODE=$?

python-test/cdm-tests/setup/build_cdm.sh

@@ -57,7 +57,7 @@ CDM_VERSION="1.2.3"
 cd ${MY_PATH} || error
 
 
-source "$MY_PATH/../../common.sh" || { echo "Failed to source common.sh"; exit 1; }
+source "$MY_PATH/../../ensure_jar_exists.sh" || { echo "Failed to source ensure_jar_exists.sh"; exit 1; }
 
 # Parse command-line arguments
 # CDM_BRANCH="master"

…hon-test/cdm-tests/setup_cdm_test_env.sh …st/cdm-tests/setup/setup_cdm_test_env.shpython-test/cdm-tests/setup_cdm_test_env.sh renamed to python-test/cdm-tests/setup/setup_cdm_test_env.sh python-test/cdm-tests/setup_cdm_test_env.sh renamed to python-test/cdm-tests/setup/setup_cdm_test_env.sh

@@ -40,8 +40,18 @@ fi
 MY_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd ${MY_PATH} || error
 
+# Parse arguments (only meaningful when run directly, not sourced)
+KEEP_ENV=0
+for arg in "$@"; do
+  case "$arg" in
+    -k|--keep-env)
+      KEEP_ENV=1
+      ;;
+  esac
+done
+
 echo "***** setting up common environment"
-PYTHONSETUPPATH="../env-setup"
+PYTHONSETUPPATH="../../env-setup"
 source $MY_PATH/$PYTHONSETUPPATH/setup_python_env.sh -r
 
 echo "***** activating virtual environment"
@@ -52,7 +62,7 @@ source "$MY_PATH/$PYTHONSETUPPATH/$VENV_PATH/${PY_SCRIPTS}/activate" || error
 
 
 # install cdm package
-PYTHONCDMDIR="../../target/python-cdm"
+PYTHONCDMDIR="../../../target/python-cdm"
 
 # Construct pip install command
 PIP_ARGS=( "$MY_PATH/$PYTHONCDMDIR"/*-*-py3-none-any.whl "--force-reinstall" "--pre" )
@@ -71,4 +81,15 @@ _reuse_env_saved="${REUSE_ENV:-}"
 export REUSE_ENV=1
 source "$MY_PATH/$PYTHONSETUPPATH/setup_python_env.sh"
 export REUSE_ENV="$_reuse_env_saved"
-source "$MY_PATH/$PYTHONSETUPPATH/$VENV_PATH/${PY_SCRIPTS}/activate" || error
+source "$MY_PATH/$PYTHONSETUPPATH/$VENV_PATH/${PY_SCRIPTS}/activate" || error
+
+# When run directly (not sourced), clean up unless -k was given
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    if [[ $KEEP_ENV -eq 1 ]]; then
+        echo "***** -k specified: virtual environment kept at $MY_PATH/$PYTHONSETUPPATH/$VENV_PATH"
+    else
+        echo "***** cleaning up virtual environment"
+        deactivate
+        source "$MY_PATH/$PYTHONSETUPPATH/cleanup_python_env.sh"
+    fi
+fi

python-test/common.sh python-test/ensure_jar_exists.shpython-test/common.sh renamed to python-test/ensure_jar_exists.sh

@@ -99,7 +99,7 @@ echo "***** Get and Install Runtime"
 # If RUNE_RUNTIME_DIR is not specified or the directory does not exist, it will install from GitHub.
 # Set RUNE_RUNTIME_REF to control which branch/tag/commit is used (default: main).
 # Example: export RUNE_RUNTIME_REF="feature/function_support"
-RUNE_RUNTIME_DIR="/Users/dls/projects/rune/rune-python-runtime/FINOS/rune-python-runtime"
+RUNE_RUNTIME_DIR="../../../../../rune/rune-python-runtime/FINOS/rune-python-runtime"
 RUNE_RUNTIME_REF="feature/function_support"
 
 if [ -n "$RUNE_RUNTIME_DIR" ] && [ -d "$RUNE_RUNTIME_DIR" ]; then

python-test/env-setup/setup_python_env.sh

@@ -115,7 +115,7 @@ cd "${MY_PATH}" || error
 PROJECT_ROOT_PATH="$MY_PATH/../.."
 PYTHON_SETUP_PATH="$MY_PATH/../env-setup"
 
-source "$MY_PATH/../common.sh" || { echo "Failed to source common.sh"; exit 1; }
+source "$MY_PATH/../ensure_jar_exists.sh" || { echo "Failed to source ensure_jar_exists.sh"; exit 1; }
 
 JAR_PATH="$PROJECT_ROOT_PATH/target/python-0.0.0.main-SNAPSHOT.jar"