tests: remove Python 2; update for embedded Python 3

Author: ilg-ul

tests/scripts/README.md

@@ -85,7 +85,7 @@ bash ~/Downloads/riscv-none-embed-gcc-xpack.git/tests/scripts/native-test.sh \
 ```
 
 Aditional options are `--32` (which must be given first) and
-`--skip-gdb-py`, `--skip-gdb-py3` which can be added at the end.
+`--skip-gdb-py3` which can be added at the end.
 
 ## Rerun test
 
@@ -118,15 +118,6 @@ tested.
 The GDB client is started with various options and commands, and should
 exit 0.
 
-Testing the GDB binaries which include Python support proved quite
-difficult, and is done summarily, only when possible.
-
-The problem is that embedding Python requires the presence of exactly
-the same version; if for final machines building from sources this exact
-version is relatively easy, doing this on all dcocker images is to
-expensive, so if the exact versions are found, the gdb-py tests are
-performed, otherwise are skipped.
-
 ## GitHub API endpoint
 
 Programatic access to GitHub is done via the v3 API:

tests/scripts/common-functions-source.sh

@@ -133,95 +133,6 @@ function test_gdb()
   fi
 
   (
-    case "${suffix}" in
-      '')
-        ;;
-
-      -py)
-        local python_name
-        if [ "${node_platform}" == "win32" ]
-        then
-          python_name="python"
-        else       
-          python_name="python2.7"
-        fi
-
-        echo
-        echo "Identifying Python 2..."
-
-        local which_python
-        set +e
-        which_python="$(which ${python_name} 2>/dev/null)"
-        if [ -z "${which_python}" ]
-        then
-          echo
-          echo ">>> No ${python_name} installed, skipping gdb_py test."
-          return
-        fi
-        set -e
-
-        echo "Found as ${which_python}."
-
-        echo
-        ${python_name} --version
-
-        export PYTHONHOME="$(${python_name} -c 'import sys; print(sys.prefix)')"
-        export PYTHONPATH="$(${python_name} -c 'import sys; import os; print(os.pathsep.join(sys.path))')"
-        echo "PYTHONHOME=${PYTHONHOME}"
-        echo "PYTHONPATH=${PYTHONPATH}"
-        ;;
-
-      -py3)
-        local python_name
-        if [ "${node_platform}" == "win32" ]
-        then
-          if [ -f "/c/Python38/python.exe" ]
-          then
-            export PATH="/c/Python38:$PATH"
-          elif [ -f "/c/Python37/python.exe" ]
-          then
-            export PATH="/c/Python37:$PATH"
-          fi
-
-          python_name="python"
-        elif [ "${node_platform}" == "linux" ]
-        then
-          python_name="python3.7"
-        elif [ "${node_platform}" == "darwin" ]
-        then
-          python_name="python3.7"
-        fi
-
-        echo
-        echo "Identifying Python 3..."
-
-        set +e
-        local which_python
-        which_python="$(which ${python_name} 2>/dev/null)"
-        if [ -z "${which_python}" ]
-        then
-          echo
-          echo ">>> No ${python_name} installed, skipping gdb_py3 test."
-          return
-        fi
-        set -e
-        echo "Found as ${which_python}."
-
-        echo
-        ${python_name} --version
-
-        export PYTHONHOME="$(${python_name} -c 'import sys; print(sys.prefix)')"
-        export PYTHONPATH="$(${python_name} -c 'import sys; import os; print(os.pathsep.join(sys.path))')"
-        echo "PYTHONHOME=${PYTHONHOME}"
-        echo "PYTHONPATH=${PYTHONPATH}"
-        ;;
-
-      *)
-        echo "Unsupported gdb-${suffix}"
-        exit 1
-        ;;
-    esac
-
     echo
     echo "Testing if gdb${suffix} starts properly..."
 
@@ -240,11 +151,24 @@ function test_gdb()
       -ex='set language auto' \
       -ex='quit'
 
+    if [ "${suffix}" == "-py3" ]
+    then
+      # Show Python paths.
+      run_app "${app_folder_path}/bin/${gcc_target_prefix}-gdb${suffix}" \
+        --nh \
+        --nx \
+        -ex='set pagination off' \
+        -ex='python import sys; print(sys.prefix)' \
+        -ex='python import sys; import os; print(os.pathsep.join(sys.path))' \
+        -ex='quit'
+    fi
+
     if [ ! -z "${suffix}" ]
     then
       local out=$("${app_folder_path}/bin/${gcc_target_prefix}-gdb${suffix}" \
         --nh \
         --nx \
+        -ex='set pagination off' \
         -ex='python print("babu"+"riba")' \
         -ex='quit' | grep 'baburiba')
       if [ "${out}" == "baburiba" ]
@@ -291,20 +215,6 @@ function run_tests()
       run_app ldd -v "${file_path}" || true
     done
   fi
-
-  echo
-  echo "All tests completed successfully."
-
-  echo
-  run_app uname -a
-  if [ "${node_platform}" == "linux" ]
-  then
-    run_app lsb_release -a
-    run_app ldd --version
-  elif [ "${node_platform}" == "darwin" ]
-  then
-    run_app sw_vers
-  fi
 }
 
 # -----------------------------------------------------------------------------

tests/scripts/container-test.sh

@@ -61,7 +61,6 @@ base_url="$1"
 echo "${base_url}"
 shift
 
-has_gdb_py="y"
 has_gdb_py3="y"
 
 while [ $# -gt 0 ]
@@ -83,18 +82,14 @@ if [[ ${image_name} == *ubuntu* ]] || [[ ${image_name} == *debian* ]] || [[ ${im
 then
   run_verbose apt-get -qq update 
   run_verbose apt-get -qq install -y git-core curl tar gzip lsb-release binutils
-  # run_verbose apt-get -qq install -y python || true
-  # run_verbose apt-get -qq install -y python3 || true
 elif [[ ${image_name} == *centos* ]] || [[ ${image_name} == *fedora* ]]
 then
   run_verbose yum install -y -q git curl tar gzip redhat-lsb-core binutils
-  # run_verbose yum install -y -q python || true
-  # run_verbose yum install -y -q python3 || true
 elif [[ ${image_name} == *opensuse* ]]
 then
+  run_verbose zypper -q refresh
+  run_verbose zypper -q update -y
   run_verbose zypper -q in -y git-core curl tar gzip lsb-release binutils
-  # run_verbose zypper -q in -y python || true
-  run_verbose zypper -q in -y python3 || true
 elif [[ ${image_name} == *manjaro* ]]
 then
   run_verbose pacman-mirrors -g
@@ -103,17 +98,13 @@ then
   # Update even if up to date (-yy) & upgrade (-u).
   # pacman -S -yy -u -q --noconfirm 
   run_verbose pacman -S -q --noconfirm --noprogressbar git curl tar gzip lsb-release binutils file
-  # run_verbose pacman -S -q --noconfirm --noprogressbar python || true
-  # run_verbose pacman -S -q --noconfirm --noprogressbar python3 || true
 elif [[ ${image_name} == *archlinux* ]]
 then
   pacman -S -y -q --noconfirm 
 
   # Update even if up to date (-yy) & upgrade (-u).
   # pacman -S -yy -u -q --noconfirm 
   run_verbose pacman -S -q --noconfirm --noprogressbar git curl tar gzip lsb-release binutils file
-  # run_verbose pacman -S -q --noconfirm --noprogressbar python || true
-  # run_verbose pacman -S -q --noconfirm --noprogressbar python3 || true
 fi
 
 # -----------------------------------------------------------------------------

tests/scripts/container-xpm-install-test.sh

@@ -77,18 +77,12 @@ then
   run_verbose apt-get -qq update 
   run_verbose apt-get -qq install -y git-core curl tar gzip lsb-release binutils
   run_verbose apt-get -qq install -y build-essential 
-  run_verbose apt-get -qq install -y python || true
-  # run_verbose apt-get -qq install -y python3 || true
 elif [[ ${image_name} == *centos* ]] || [[ ${image_name} == *fedora* ]]
 then
   run_verbose yum install -y -q git curl tar gzip redhat-lsb-core binutils
-  run_verbose yum install -y -q python || true
-  # run_verbose yum install -y -q python3 || true
 elif [[ ${image_name} == *opensuse* ]]
 then
   run_verbose zypper -q in -y git-core curl tar gzip lsb-release binutils
-  run_verbose zypper -q in -y python || true
-  # run_verbose zypper -q in -y python3 || true
 elif [[ ${image_name} == *manjaro* ]]
 then
   run_verbose pacman-mirrors -g
@@ -97,17 +91,13 @@ then
   # Update even if up to date (-yy) & upgrade (-u).
   # pacman -S -yy -u -q --noconfirm 
   run_verbose pacman -S -q --noconfirm --noprogressbar git curl tar gzip lsb-release binutils file
-  run_verbose pacman -S -q --noconfirm --noprogressbar python || true
-  # run_verbose pacman -S -q --noconfirm --noprogressbar python3 || true
 elif [[ ${image_name} == *archlinux* ]]
 then
   pacman -S -y -q --noconfirm 
 
   # Update even if up to date (-yy) & upgrade (-u).
   # pacman -S -yy -u -q --noconfirm 
   run_verbose pacman -S -q --noconfirm --noprogressbar git curl tar gzip lsb-release binutils file
-  run_verbose pacman -S -q --noconfirm --noprogressbar python || true
-  # run_verbose pacman -S -q --noconfirm --noprogressbar python3 || true
 fi
 
 # -----------------------------------------------------------------------------

tests/scripts/native-test.sh

@@ -62,18 +62,12 @@ base_url="$1"
 echo "${base_url}"
 shift
 
-has_gdb_py="y"
 has_gdb_py3="y"
 
 while [ $# -gt 0 ]
 do
   case "$1" in
 
-    --skip-gdb-py)
-      has_gdb_py="n"
-      shift
-      ;;
-
     --skip-gdb-py3)
       has_gdb_py3="n"
       shift
@@ -93,21 +87,6 @@ echo "${base_url}"
 
 detect_architecture
 
-if [ "${node_platform}" == "win32" ]
-then
-  # https://chocolatey.org/docs/commands-reference
-  choco list --local-only
-  # https://chocolatey.org/packages/python3
-  choco install python --version=3.7.6 --yes
-  env | sort
-
-  echo
-  echo ls -l /c/Python*
-  ls -l /c/Python*
-  
-  echo
-fi
-
 prepare_env "$(dirname $(dirname "${script_folder_path}"))"
 
 install_archive

tests/scripts/trigger-travis-quick.sh

@@ -50,7 +50,7 @@ source "${helper_folder_path}/test-functions-source.sh"
 
 # -----------------------------------------------------------------------------
 
-message="Test ${app_description} on stable platforms"
+message="Test ${app_description} on few platforms"
 branch="xpack-develop"
 
 version="$(cat $(dirname $(dirname ${script_folder_path}))/scripts/VERSION)"