From 664e3573d4b178bbbf6e080b7b7f2477853d1fbd Mon Sep 17 00:00:00 2001 From: Xiangyu Chen Date: Sun, 7 Jan 2024 20:56:09 +0800 Subject: lxc: adjust the lxc-test-unpriv running order Some of lxc test cases can not full clean the system environment, that cause lxc-test-unpriv cannot execute successfully. Since those code in lxc are using for tests, so just adjust the cases order. Signed-off-by: Xiangyu Chen Signed-off-by: Bruce Ashfield --- recipes-containers/lxc/files/run-ptest | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/recipes-containers/lxc/files/run-ptest b/recipes-containers/lxc/files/run-ptest index 2e5af3c3..196adb04 100644 --- a/recipes-containers/lxc/files/run-ptest +++ b/recipes-containers/lxc/files/run-ptest @@ -16,6 +16,10 @@ blacklist="$blacklist lxc-test-get_item" blacklist="$blacklist lxc-test-shutdowntest" blacklist="$blacklist lxc-test-state-server" +# Tests in firstrunlist will be run first +firstrunlist="" +firstrunlist="$firstrunlist lxc-test-unpriv" + passed=0 failed=0 skipped=0 @@ -26,11 +30,29 @@ rm -f logs/* echo "### Starting LXC ptest ###" +for test in $firstrunlist +do + ./tests/$test >logs/$(basename $test).log 2>&1 + if [ $? -eq 0 ] + then + echo "PASS: $(basename $test)" + passed=$((passed+1)) + else + echo "FAIL: $(basename $test)" + failed=$((failed+1)) + fi +done + for test in ./tests/* do if [[ ! $blacklist = *$(basename $test)* ]] then - $test >logs/$(basename $test).log 2>&1 + if [[ ! $firstrunlist = *$(basename $test)* ]] + then + $test >logs/$(basename $test).log 2>&1 + else + continue; + fi else echo "SKIPPED: $(basename $test)" skipped=$((skipped+1)) @@ -47,6 +69,7 @@ do fi done + echo "" echo "Results:" echo " PASSED = $passed" -- cgit v1.2.3-54-g00ecf