modularizing parsing arguments for tests

Signed-off-by: Lucas Yoon <[email protected]>

Author: Lucas Yoon

tests/check_non_terminating.sh

@@ -3,35 +3,13 @@ set -o nounset
 set -o errexit
 
 # Source shared utilities
-source "$(dirname "$0")/get_paths.sh"
-
-POSITIONAL_ARGS=()
-
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --stackDirs)
-      stackDirs=$2
-      shift # past argument
-      shift
-      ;;
-    --stacksPath)
-      stacksPath=$2
-      shift # past argument
-      shift
-      ;;
-    -*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-    *)
-      POSITIONAL_ARGS+=("$1") # save positional arg
-      shift # past argument
-      ;;
-  esac
-done
+source "$(dirname "$0")/paths_util.sh"
+
+# Parse all arguments
+parse_arguments "$@"
 
 # Restore positional parameters
-restore_positional_args POSITIONAL_ARGS
+set -- "${POSITIONAL_ARGS[@]}"
 
 # Set defaults for stack arguments
 set_stack_defaults

tests/check_odov3.sh

@@ -3,36 +3,13 @@
 set -x
 
 # Source shared utilities
-source "$(dirname "$0")/get_paths.sh"
+source "$(dirname "$0")/paths_util.sh"
 
-POSITIONAL_ARGS=()
-VERBOSE="false"
-
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --stackDirs)
-      stackDirs=$2
-      shift # past argument
-      shift
-      ;;
-    --stacksPath)
-      stacksPath=$2
-      shift # past argument
-      shift
-      ;;
-    -*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-    *)
-      POSITIONAL_ARGS+=("$1") # save positional arg
-      shift # past argument
-      ;;
-  esac
-done
+# Parse all arguments
+parse_arguments "$@"
 
 # Restore positional parameters
-restore_positional_args POSITIONAL_ARGS
+set -- "${POSITIONAL_ARGS[@]}"
 
 # Set defaults for stack arguments
 set_stack_defaults

tests/common_args.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+# Common variables used by all scripts
+stackDirs=''
+stacksPath=''
+POSITIONAL_ARGS=()
+
+# Function to parse all arguments
+parse_arguments() {
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            --stackDirs)
+                if [ -z "${stackDirs}" ]; then
+                    stackDirs=$2
+                else
+                    stackDirs="${stackDirs} $2"
+                fi
+                shift # past argument
+                shift
+                ;;
+            --stacksPath)
+                stacksPath=$2
+                shift # past argument
+                shift
+                ;;
+            -*|--*)
+                # Try script-specific handler if it exists
+                local consumed=0
+                local errno=1
+                if declare -f handle_additional_args > /dev/null 2>&1; then
+                    consumed=$(handle_additional_args "$@")
+                    errno=$?
+                fi
+                
+                if [ $errno -eq 0 ] && [ $consumed -gt 0 ]; then
+                    # Script handler consumed some arguments
+                    for ((i=0; i<consumed; i++)); do
+                        shift
+                    done
+                else
+                    echo "Unknown option $1"
+                    return $errno
+                fi
+                ;;
+            *)
+                POSITIONAL_ARGS+=("$1") # save positional arg
+                shift # past argument
+                ;;
+        esac
+    done
+    
+    return 0
+}
+
+# Function to set default values for stack arguments
+set_stack_defaults() {
+    if [ -z "$stackDirs" ]; then
+        stackDirs=$(bash "$(pwd)/tests/get_stacks.sh")
+    fi
+
+    if [ -z "$stacksPath" ]; then
+        stacksPath="$(pwd)/stacks"
+    fi
+}

tests/get_paths.sh

@@ -1,45 +1,35 @@
 #!/usr/bin/env bash
 
 # Source shared utilities
-source "$(dirname "$0")/get_paths.sh"
+source "$(dirname "$0")/paths_util.sh"
 
-POSITIONAL_ARGS=()
 SAMPLES="false"
 VERBOSE="false"
 
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    -s|--samples)
-      SAMPLES="true"
-      shift # past argument
-      ;;
-    -v|--verbose)
-      VERBOSE="true"
-      shift # past argument
-      ;;
-    --stackDirs)
-      stackDirs=$2
-      shift # past argument
-      shift
-      ;;
-    --stacksPath)
-      stacksPath=$2
-      shift # past argument
-      shift
-      ;;
-    -*|--*)
-      echo "Unknown option $1"
-      exit 1
-      ;;
-    *)
-      POSITIONAL_ARGS+=("$1") # save positional arg
-      shift # past argument
-      ;;
-  esac
-done
+handle_additional_args() {
+    case $1 in
+        -s|--samples)
+            SAMPLES="true"
+            echo 1
+            return 0
+            ;;
+        -v|--verbose)
+            VERBOSE="true"
+            echo 1
+            return 0 
+            ;;
+        *)
+            echo 0
+            return 1
+            ;;
+    esac
+}
+
+# Parse all arguments
+parse_arguments "$@"
 
 # Restore positional parameters
-restore_positional_args POSITIONAL_ARGS
+set -- "${POSITIONAL_ARGS[@]}"
 
 set -x