diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh index 78b06364b5f45e3e9046dc52095dcdc035038e4d..5b1684f0fe56a5866d30aa9022c37bebb07fdf21 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh @@ -46,26 +46,30 @@ do_test() init_value3=$(cat $_ssr_path/hc_hot_node_lower_limit) init_value4=$(cat $_ssr_path/hc_warm_node_lower_limit) - confirm_value hc_hot_data_lower_limit - confirm_value hc_warm_data_lower_limit - confirm_value hc_hot_node_lower_limit + confirm_value hc_hot_data_lower_limit && + confirm_value hc_warm_data_lower_limit && + confirm_value hc_hot_node_lower_limit && confirm_value hc_warm_node_lower_limit + [ $? -ne 0 ] && ret=$(( $ret + 1 )) + echo 6000000 > $_ssr_path/hc_hot_data_lower_limit echo 6000000 > $_ssr_path/hc_warm_data_lower_limit echo 6000000 > $_ssr_path/hc_hot_node_lower_limit echo 6000000 > $_ssr_path/hc_warm_node_lower_limit - confirm_change_value hc_hot_data_lower_limit - confirm_change_value hc_warm_data_lower_limit - confirm_change_value hc_hot_node_lower_limit + confirm_change_value hc_hot_data_lower_limit && + confirm_change_value hc_warm_data_lower_limit && + confirm_change_value hc_hot_node_lower_limit && confirm_change_value hc_warm_node_lower_limit + [ $? -ne 0 ] && ret=$(( $ret + 1 )) + if [ $ret -eq 0 ];then - tst_res TPASS "hierarchical SSR threshold configuration interface pass." - else - tst_res TFAIL "Hierarchical SSR threshold configuration interface failed!" - fi + tst_res TPASS "hierarchical SSR threshold configuration interface pass." + else + tst_res TFAIL "Hierarchical SSR threshold configuration interface failed!" + fi } confirm_value() @@ -73,9 +77,10 @@ confirm_value() local result_out1=$(cat /sys/fs/f2fs/loop1/$1) if [ "$result_out1" == "5242880" ]; then tst_res TPASS "$1 is 5242880 expected." + return 0 else tst_res TFAIL "$1 is not 5242880 unexpected!" - ret=$(( $ret + 1 )) + return 1 fi } @@ -84,9 +89,10 @@ confirm_change_value() local result_out2=$(cat /sys/fs/f2fs/loop1/$1) if [ "$result_out2" == "6000000" ]; then tst_res TPASS "$1 is 6000000 expected." + return 0 else tst_res TFAIL "$1 is not 6000000 unexpected!" - ret=$(( $ret + 1 )) + return 1 fi } @@ -96,7 +102,7 @@ do_clean() echo $init_value2 > $_ssr_path/hc_warm_data_lower_limit echo $init_value3 > $_ssr_path/hc_hot_node_lower_limit echo $init_value4 > $_ssr_path/hc_warm_node_lower_limit - losetup -d /dev/block/loop1 + losetup -d /dev/block/loop1 umount /mnt/f2fs_mount } diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh index 86ecb532e3ff05a174131d60cfef4e88bb1068fa..e5d01013e7998b769554caf1b12bd8a6c36eb070 100644 --- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh +++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh @@ -100,7 +100,7 @@ do_clean() echo $init_value2 > $_ssr_path/hc_warm_data_waterline echo $init_value3 > $_ssr_path/hc_hot_node_waterline echo $init_value4 > $_ssr_path/hc_warm_node_waterline - losetup -d /dev/block/loop1 + losetup -d /dev/block/loop1 umount /mnt/f2fs_mount } diff --git a/test/moduletest/runtest/conf/OH_RK3568_config b/test/moduletest/runtest/conf/OH_RK3568_config index b06cb618eef06c0377cc43387e62aad946f9fec7..431111d430c186d1167256af395c18a54fdd18a4 100644 --- a/test/moduletest/runtest/conf/OH_RK3568_config +++ b/test/moduletest/runtest/conf/OH_RK3568_config @@ -23,8 +23,8 @@ # History: Mar 15 2022 - init scripts # ################################################################################ +sched_rtg_t cpuisolation_t cpusetdecouple_cpuhotplug_t enhancedswap_t -sched_rtg_t enhancedf2fs_t