mirror of
https://git.yoctoproject.org/poky
synced 2026-03-08 00:09:40 +01:00
3ea3e3435f
Skip wrong testcase(12-15) in testbuild-linux and rebase the patch tweak-ptest-script.patch. (From OE-Core rev: 4edcfbace258d94d814c7d61f467e5384e2645fb) Signed-off-by: Zqiang <qiang.zhang@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
Tweak tests of ifupdown to make it work with oe-core ptest framework.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
|
tests/testbuild-linux | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/tests/testbuild-linux b/tests/testbuild-linux
|
|
index 5f148eb..d9b1698 100755
|
|
--- a/tests/testbuild-linux
|
|
+++ b/tests/testbuild-linux
|
|
@@ -1,6 +1,7 @@
|
|
#!/bin/sh -e
|
|
|
|
-dir=tests/linux
|
|
+curdir=$(dirname `readlink -f $0`)
|
|
+dir=$curdir/linux
|
|
|
|
result=true
|
|
for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
|
|
@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
|
|
echo "Testcase $test: $args"
|
|
|
|
exitcode=0
|
|
- ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
|
+ ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
|
>$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$?
|
|
|
|
(echo "exit code: $exitcode";
|
|
@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
|
|
echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test
|
|
|
|
exitcode=0
|
|
- ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
|
+ ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \
|
|
>$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$?
|
|
|
|
(echo "exit code: $exitcode";
|
|
@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
|
|
echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test
|
|
|
|
if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then
|
|
- echo "(okay)"
|
|
+ echo "PASS: $test"
|
|
else
|
|
- echo "(failed)"
|
|
+ echo "FAIL: $test"
|
|
result=false
|
|
fi
|
|
echo "=========="
|
|
--
|
|
2.17.1
|