Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 1 | From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kai Kang <kai.kang@windriver.com> |
| 3 | Date: Mon, 3 Feb 2020 17:33:11 +0800 |
| 4 | Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest |
| 5 | framework. |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 6 | |
| 7 | Upstream-Status: Inappropriate [oe-core specific] |
| 8 | |
| 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 10 | |
Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 11 | --- |
| 12 | tests/testbuild-linux | 11 ++++++----- |
| 13 | 1 file changed, 6 insertions(+), 5 deletions(-) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 14 | |
| 15 | diff --git a/tests/testbuild-linux b/tests/testbuild-linux |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 16 | index 2c69856..05f0703 100755 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 17 | --- a/tests/testbuild-linux |
| 18 | +++ b/tests/testbuild-linux |
| 19 | @@ -1,6 +1,7 @@ |
| 20 | #!/bin/sh -e |
| 21 | |
| 22 | -dir=tests/linux |
| 23 | +curdir=$(dirname `readlink -f $0`) |
| 24 | +dir=$curdir/linux |
| 25 | |
| 26 | result=true |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 27 | for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
| 28 | @@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 29 | echo "Testcase $test: $args" |
| 30 | |
| 31 | exitcode=0 |
| 32 | - ./ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ |
| 33 | + ifup -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ |
| 34 | >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? |
| 35 | |
| 36 | (echo "exit code: $exitcode"; |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 37 | @@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 38 | echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test |
| 39 | |
| 40 | exitcode=0 |
| 41 | - ./ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ |
| 42 | + ifdown -v --no-act-commands --force -i $dir/testcase.$test --state-dir=$dir/state.$test $args \ |
| 43 | >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? |
| 44 | |
| 45 | (echo "exit code: $exitcode"; |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 46 | @@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 47 | echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test |
| 48 | |
| 49 | if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then |
| 50 | - echo "(okay)" |
| 51 | + echo "PASS: $test" |
| 52 | else |
| 53 | - echo "(failed)" |
| 54 | + echo "FAIL: $test" |
| 55 | result=false |
| 56 | fi |
| 57 | echo "==========" |