use pytest-skip plugin for selection in the test script

Removes --text-expr argument and replaces it with --select <name>
Refactors --pdb pytest call into pytest-utils.sh

Signed-off-by: Sławomir Błauciak <[email protected]>

Author: slawblauciak

scripts/pytest-utils.sh

@@ -38,6 +38,16 @@ pytest() {
         pytest_extra_args+=(
             "--select-from-file=$TRITON_TEST_SELECTFILE"
         )
+    elif [[ -n $TRITON_TEST_SELECT ]]; then
+        pytest_extra_args+=(
+            "--select-test=$TRITON_TEST_SELECT"
+        )
+    fi
+
+    if [[ $TRITON_TEST_DEBUG_FAIL = true ]]; then
+        pytest_extra_args+=(
+            "--pdb"
+        )
     fi
 
     if [[ ! -f $TRITON_TEST_SELECTFILE && -v TRITON_TEST_SUITE && -f $TRITON_TEST_SKIPLIST_DIR/$TRITON_TEST_SUITE.txt ]]; then

scripts/test-triton.sh

@@ -45,7 +45,7 @@ OPTION:
     --skip-list SKIPLIST
     --extra-skip-list-suffixes SEMICOLON-SEPARATED LIST OF SUFFIXES
     --select-from-file SELECTFILE
-    --test-expr EXPRESSION
+    --select NAME
     --debug-fail
 "
 
@@ -88,8 +88,8 @@ TRITON_TEST_IGNORE_ERRORS=false
 SKIP_PIP=false
 SKIP_PYTORCH=false
 TEST_UNSKIP=false
-TEST_FILTER_EXPRESSION=""
-TEST_DEBUG_FAIL=false
+TRITON_TEST_SELECT=""
+TRITON_TEST_DEBUG_FAIL=false
 
 while (( $# != 0 )); do
   case "$1" in
@@ -277,12 +277,12 @@ while (( $# != 0 )); do
       TRITON_TEST_SELECTFILE="$(realpath "$2")"
       shift 2
       ;;
-    --test-expr)
-      TEST_FILTER_EXPRESSION="$2"
+    --select)
+      TRITON_TEST_SELECT="$2"
       shift 2
       ;;
     --debug-fail)
-      TEST_DEBUG_FAIL=true
+      TRITON_TEST_DEBUG_FAIL=true
       shift
       ;;
     --help)
@@ -354,44 +354,12 @@ run_unit_tests() {
 }
 
 run_pytest_command() {
-  local pytest_args=()
-  local pytest_expr=""
-
-  # Parse args to separate -k expression
-  local args=("$@")
-  for ((i=0; i<${#args[@]}; i++)); do
-    if [[ "${args[i]}" == "-k" ]]; then
-      pytest_expr="${args[i+1]}"
-      i=$((i + 1))
-      continue
-    fi
-    pytest_args+=("${args[i]}")
-  done
-
-  # Combine with TEST_FILTER_EXPRESSION
-  if [[ -n "$TEST_FILTER_EXPRESSION" ]]; then
-    if [[ -n "$pytest_expr" ]]; then
-      pytest_expr="($pytest_expr) and ($TEST_FILTER_EXPRESSION)"
-    else
-      pytest_expr="$TEST_FILTER_EXPRESSION"
-    fi
-  fi
-
-  # Apply -k expression if any
-  if [[ -n "$pytest_expr" ]]; then
-    pytest_args+=("-k" "$pytest_expr")
-  fi
-
-  if [[ "$TEST_DEBUG_FAIL" == true ]]; then
-    pytest_args+=("--pdb")
-  fi
-
-  if [[ -n "$TRITON_TEST_SELECTFILE" ]] || [[ -n "$pytest_expr" ]]; then
-    if pytest "${pytest_args[@]}" --collect-only > /dev/null 2>&1; then
-      pytest "${pytest_args[@]}"
+  if [[ -n "$TRITON_TEST_SELECTFILE" ]] || [[ -n "$TRITON_TEST_SELECT" ]]; then
+    if pytest "$@" --collect-only > /dev/null 2>&1; then
+      pytest "$@"
     fi
   else
-    pytest "${pytest_args[@]}"
+    pytest "$@"
   fi
 }