Changeset 59564e6 in mainline

Timestamp:

2018-12-21T20:42:09Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

accdbd8

Parents:

a49c39c8 (diff), cb15b49c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-12-21 20:42:09)

git-committer:

GitHub <noreply@…> (2018-12-21 20:42:09)

Message:

Merge pull request #138 from matthieuriolo/ticket_569

Adds a new flag for testing the installed version against the version in toolchain.sh.

./tools/toolchain.sh —test-version
./tools/toolchain.sh —test-version all
./tools/toolchain.sh —test-version ia32

File:

• tools/toolchain.sh (modified) (4 diffs)

tools/toolchain.sh

@@ -61 +61 @@
         echo "Syntax:"
         echo " $0 [--no-install] [--non-helenos-target] <platform>"
+        echo " $0 --test-version [<platform>]"
         echo
         echo "Possible target platforms are:"
@@ -95 +96 @@
 }
 
+test_version() {
+        echo "Cross-compiler toolchain build script"
+        echo
+        echo "Start testing the version of the installed software" 
+        echo
+        
+        if [ -z "$1" ] || [ "$1" == "all" ] ; then
+                PLATFORMS=("amd64" "arm32" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
+        else
+                PLATFORMS=("$1")
+        fi
+        
+        
+        if [ -z "${CROSS_PREFIX}" ] ; then
+                CROSS_PREFIX="/usr/local/cross"
+        fi
+
+        for i in "${PLATFORMS[@]}"
+        do
+                PLATFORM="$i"
+                set_target_from_platform "$PLATFORM"
+                PREFIX="${CROSS_PREFIX}/bin/${HELENOS_TARGET}"
+
+                echo "== $PLATFORM =="
+                test_app_version "Binutils" "ld" "GNU\ ld\ \(GNU\ Binutils\)\ ((\.|[0-9])+)" "$BINUTILS_VERSION"
+                test_app_version "GCC" "gcc" "gcc\ version\ ((\.|[0-9])+)" "$GCC_VERSION"
+                test_app_version "GDB" "gdb" "GNU\ gdb\ \(GDB\)\s+((\.|[0-9])+)" "$GDB_VERSION"
+        done
+
+        exit
+}
+
+test_app_version() {
+        PKGNAME="$1"
+        APPNAME="$2"
+        REGEX="$3"
+        INS_VERSION="$4"
+
+
+        APP="${PREFIX}-${APPNAME}"
+        if [ ! -e $APP ]; then
+                echo "- $PKGNAME is missing"
+        else
+                {
+                        OUT=$(${APP} -v 2>&1)
+                } &> /dev/null
+
+                if [[ "$OUT" =~ $REGEX ]]; then
+                VERSION="${BASH_REMATCH[1]}"
+                if [ "$INS_VERSION" = "$VERSION" ]; then
+                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
+                else
+                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
+                fi
+            else
+                echo "- $PKGNAME Unexpected output"
+            fi
+        fi
+}
+
+
+
 change_title() {
         echo -en "\e]0;$1\a"
@@ -408 +471 @@
 while [ "$#" -gt 1 ] ; do
         case "$1" in
+                --test-version)
+                        test_version "$2"
+                        exit
+                        ;;
                 --no-install)
                         REAL_INSTALL=false
@@ -427 +494 @@
 
 case "$1" in
+        --test-version)
+                test_version
+                ;;
         amd64|arm32|ia32|ia64|mips32|mips32eb|ppc32|riscv64|sparc64)
                 prepare