debug

5 files changed, 95 insertions, 5 deletions

diff --git a/android/scripts/toolchain-android-debug.sh b/android/scripts/toolchain-android-debug.sh
new file mode 100755
index 0000000..70f92ff
--- /dev/null
+++ b/android/scripts/toolchain-android-debug.sh
@@ -0,0 +1,89 @@
+#!/system/bin/sh
+#
+# toolchain test cases for Linaro Android
+#
+# Copyright (C) 2013, Linaro Limited.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# Author: Chase Qi <chase.qi@linaro.org>
+
+# Test case definitions
+# Check if /proc/version and toolchain version not empty
+toolchain_not_empty() {
+    echo -e "\n================"
+    echo "Check if /proc/version and toolchain version not empty"
+    echo "Content of /proc/version:"
+    echo `cat /proc/version`
+    version=`grep "Linaro GCC" /proc/version`
+    if [ -z "$version" ]
+    then
+        echo "toolchain_not_empty:" "fail" "Not specified"
+        return 1
+    else
+        echo "toolchain_not_empty:" "pass" "Not specified"
+    fi
+}
+
+# Check if toolchain version correct
+toolchain_version_measurement() {
+    echo -e "\n================"
+    echo "Check if toolchain version correct"
+    echo "Content of /proc/version:"
+    echo `cat /proc/version`
+    LinaroGCC=`awk '{print substr($12,5,7)}' /proc/version`
+    BuildYear=`awk '{print $22;}' /proc/version`
+    BuildMonth=`awk '{print $18;}' /proc/version`
+    case $BuildMonth in
+         Jan) BuildMonth=01 ;;
+         Feb) BuildMonth=02 ;;
+         Mar) BuildMonth=03 ;;
+         Apr) BuildMonth=04 ;;
+         May) BuildMonth=05 ;;
+         Jun) BuildMonth=06 ;;
+         Jul) BuildMonth=07 ;;
+         Aug) BuildMonth=08 ;;
+         Sep) BuildMonth=09 ;;
+         Oct) BuildMonth=10 ;;
+         Nov) BuildMonth=11 ;;
+         Dec) BuildMonth=12 ;;
+    esac
+    BuildDay=`awk '{print $19;}' /proc/version`
+    Measurement=$BuildYear.$BuildMonth
+
+    if [ $BuildDay -ge 16 ]
+    then
+        if [ "$LinaroGCC" != "$Measurement" ]
+        then
+           echo "Toolchain $Measurement should be used after the 15th"
+           echo "Toolchain used for this image: $LinaroGCC"
+           echo "toolchain_version_measurement:" "fail" "$LinaroGCC"
+           return 1
+        else
+           echo "Toolchain version: $LinaroGCC"
+           echo "toolchain_version_measurement:" "pass" "$LinaroGCC"
+        fi
+    else
+        echo "Toolchain version: $LinaroGCC"
+        echo "toolchain_version_measurement:" "pass" "$LinaroGCC"
+    fi
+}
+
+# run the tests
+toolchain_not_empty
+toolchain_version_measurement
+
+# clean exit so lava-test can trust the results
+exit 0
diff --git a/android/scripts/toolchain-android.sh b/android/scripts/toolchain-android.sh
index 46391ff..121e2a1 100755
--- a/android/scripts/toolchain-android.sh
+++ b/android/scripts/toolchain-android.sh
@@ -30,10 +30,10 @@ toolchain_not_empty() {
     version=`grep "Linaro GCC" /proc/version`
     if [ -z "$version" ]
     then
-        echo "toolchain_not_empty:" "fail"
+        echo "toolchain_not_empty:" "fail" "0"
         return 1
     else
-        echo "toolchain_not_empty:" "pass"
+        echo "toolchain_not_empty:" "pass" "0"
     fi
 }
 
diff --git a/android/toolchain-android.yaml b/android/toolchain-android.yaml
index 5be6e9d..edae8e8 100644
--- a/android/toolchain-android.yaml
+++ b/android/toolchain-android.yaml
@@ -24,4 +24,4 @@ run:
         - "./android/scripts/toolchain-android.sh"
 
 parse:
-    pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))\\s(?P<measurement>[0-9.])"
+    pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))\\s+(?P<measurement>[0-9.]+)"
diff --git a/android/toolchain-androida.yaml b/android/toolchain-androida.yaml
index da6d3c3..0c5c856 100644
--- a/android/toolchain-androida.yaml
+++ b/android/toolchain-androida.yaml
@@ -24,4 +24,4 @@ run:
         - "./android/scripts/toolchain-android.sh"
 
 parse:
-    pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))\\s(?P<measurement>\\d{4}.\d{2}$)"
+    pattern: "(?P<test_case_id>.*-*):\s+(?P<result>(pass|fail))\s+(?P<measurement>[0-9.]+)"
diff --git a/android/toolchain-androidb.yaml b/android/toolchain-androidb.yaml
index 332028c..cde1a50 100644
--- a/android/toolchain-androidb.yaml
+++ b/android/toolchain-androidb.yaml
@@ -24,4 +24,5 @@ run:
         - "./android/scripts/toolchain-android.sh"
 
 parse:
-    pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))\\s(?P<measurement>\\d{4}.\d{2})"
+    pattern: "(?P<test_case_id>.*-*):\s+(?P<result>(pass|fail))\s+(?P<measurement>[0-9.a-zA-Z\s]+)"
+