aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/toolchain-android.yaml2
-rwxr-xr-xubuntu/scripts/multiple-network-interfaces-test.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/android/toolchain-android.yaml b/android/toolchain-android.yaml
index 182e6aa..cb73c63 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>[\\s\\S]+)"
+ pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))\\s+(?P<measurement>[\\w\\W]+)"
diff --git a/ubuntu/scripts/multiple-network-interfaces-test.sh b/ubuntu/scripts/multiple-network-interfaces-test.sh
index 5f089c5..f178911 100755
--- a/ubuntu/scripts/multiple-network-interfaces-test.sh
+++ b/ubuntu/scripts/multiple-network-interfaces-test.sh
@@ -127,14 +127,14 @@ fi
address-arp-flux
for i in $(ls /proc/sys/net/ipv4/conf/ | grep eth)
do
- if [ "$i" != "eth0" ]
+ if test "$i" = "eth0"
then
+ ping-test
+ else
interface-enable-test
link-detect
ip-not-empty
ping-test
- else
- ping-test
fi
done