From 3cd5bf2740ce321485ce0b606c5c5462acbfb6e0 Mon Sep 17 00:00:00 2001 From: saarloos <9090-90-90-9090@163.com> Date: Tue, 22 Nov 2022 17:35:36 +0800 Subject: [PATCH] test: del use native sdk environment, enable br iptab native sdk only use for build, set bridge-nf-call-iptables enable for qemu bridge in docker env Signed-off-by: saarloos <9090-90-90-9090@163.com> --- test_tools/ci_test.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test_tools/ci_test.sh b/test_tools/ci_test.sh index 802f1c48..04b39a51 100644 --- a/test_tools/ci_test.sh +++ b/test_tools/ci_test.sh @@ -287,11 +287,12 @@ function set_param() { } function main() { - # 环境准备 - if [ -e /opt/buildtools/nativesdk/environment-setup-x86_64-pokysdk-linux ]; then - source /opt/buildtools/nativesdk/environment-setup-x86_64-pokysdk-linux - export MUGEN_QEMU_ACL_DIR="/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/etc/qemu/" + br_nf_iptab_num=1 + if [ -e /proc/sys/net/bridge/bridge-nf-call-iptables ]; then + br_nf_iptab_num=$(sudo cat /proc/sys/net/bridge/bridge-nf-call-iptables) + echo 0 | sudo tee /proc/sys/net/bridge/bridge-nf-call-iptables fi + set_param "$@" run_test_dir="${TEST_WORK_DIR}/test_run_dir_${BUILD_ARCH}_${IMAGE_TYPE}" @@ -360,6 +361,8 @@ EOF run_test test_result_ana + echo ${br_nf_iptab_num} | sudo tee /proc/sys/net/bridge/bridge-nf-call-iptables + exit $exitCode } -- Gitee