Initially these testcases required a host with 4 CPUs and 3 memory nodes minumum. This prevented to run the testcases on widely used 2-memory-nodes configuration.
And in fact the testcases only need 2 memory nodes, and a few needs 4 CPUs. Modified the checks accordingly. Now "ideal" minumum configuration of a host is 4 CPUs and 2 memory nodes. Signed-off-by: Stanislav Kholmanskikh <[email protected]> --- .../cpuset_base_ops_testset.sh | 14 ++++++++++---- .../kernel/controllers/cpuset/cpuset_funcs.sh | 15 +++++++++------ .../cpuset_load_balance_test.sh | 3 +-- .../cpuset_sched_domains_test.sh | 3 +-- .../cpuset_memory_spread_testset.sh | 1 - .../cpuset_memory_test/cpuset_memory_testset.sh | 1 - .../cpuset_syscall_test/cpuset_syscall_testset.sh | 14 ++++++++++++-- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh index be28c4b..3fa905c 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh @@ -118,13 +118,16 @@ test_cpus() -1 WRITE_ERROR 0-$nr_cpus WRITE_ERROR 0--$((nr_cpus-1)) WRITE_ERROR - 0,1-$((nr_cpus-2)),$((nr_cpus-1)) 0-$((nr_cpus-1)) - 0,1-$((nr_cpus-2)), 0-$((nr_cpus-2)) 0AAA WRITE_ERROR AAA WRITE_ERROR EOF # while read cpus result + if [ $nr_cpus -ge 3 ]; then + base_op_test "$CPUSET/1/cpus" "0,1-$((nr_cpus-2)),$((nr_cpus-1))" "0-$((nr_cpus-1))" + base_op_test "$CPUSET/1/cpus" "0,1-$((nr_cpus-2))," "0-$((nr_cpus-2))" + fi + tst_kvercmp 3 0 0 if [ $? -eq 0 ]; then base_op_test "$CPUSET/1/cpus" "0-" "WRITE_ERROR" @@ -151,13 +154,16 @@ test_mems() -1 WRITE_ERROR 0-$nr_mems WRITE_ERROR 0--$((nr_mems-1)) WRITE_ERROR - 0,1-$((nr_mems-2)),$((nr_mems-1)) 0-$((nr_mems-1)) - 0,1-$((nr_mems-2)), 0-$((nr_mems-2)) 0AAA WRITE_ERROR AAA WRITE_ERROR EOF # while read mems result + if [ $nr_mems -ge 3 ]; then + base_op_test "$CPUSET/1/mems" "0,1-$((nr_mems-2)),$((nr_mems-1))" "0-$((nr_mems-1))" + base_op_test "$CPUSET/1/mems" "0,1-$((nr_mems-2))," "0-$((nr_mems-2))" + fi + tst_kvercmp 3 0 0 if [ $? -eq 0 ]; then base_op_test "$CPUSET/1/mems" "0-" "WRITE_ERROR" diff --git a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh index edca7b4..3419a11 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh @@ -65,16 +65,16 @@ version_check() ncpus_check() { - if [ $NR_CPUS -lt 4 ]; then - tst_brkm TCONF ignored "The total of CPUs is less than 4" + if [ $NR_CPUS -lt $1 ]; then + tst_brkm TCONF ignored "The total of CPUs is less than $1" return 1 fi } nnodes_check() { - if [ $N_NODES -lt 3 ]; then - tst_brkm TCONF ignored "The total of nodes is less than 3" + if [ $N_NODES -lt $1 ]; then + tst_brkm TCONF ignored "The total of nodes is less than $1" return 1 fi } @@ -103,6 +103,9 @@ cpuset_check() return 1 } +# optional parameters (pass both or none of them): +# $1 - required number of cpus (default 2) +# $2 - required number of memory nodes (default 2) check() { user_check @@ -120,12 +123,12 @@ check() exit 0 fi - ncpus_check + ncpus_check ${1:-2} if [ $? -ne 0 ]; then exit 0 fi - nnodes_check + nnodes_check ${2:-2} if [ $? -ne 0 ]; then exit 0 fi diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh index 8ba7222..7123019 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh @@ -28,11 +28,10 @@ export TST_COUNT=1 . cpuset_funcs.sh -check +check 4 2 exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh index 53675ec..014bc74 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh @@ -28,11 +28,10 @@ export TST_COUNT=1 . cpuset_funcs.sh -check +check 4 2 exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh index ae1bc09..ad989f3 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh @@ -31,7 +31,6 @@ export TST_COUNT=1 check exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh index 315f759..e8ef6bf 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh @@ -32,7 +32,6 @@ check exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh index 587e912..561c3b9 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh @@ -32,6 +32,8 @@ check exit_status=0 +nr_mems=$N_NODES + TEST_CPUSET="$CPUSET/0" TEST_OUTPUT="$CPUSET_TMP/result" TEST_PROCSTATUS="$CPUSET_TMP/status" @@ -276,14 +278,22 @@ test12() test13() { - do_syscall_test 0 0-1 --set_mempolicy=6 0 || return 1 + if [ $nr_mems -ge 3 ]; then + do_syscall_test 0 0-1 --set_mempolicy=6 0 || return 1 + else + do_syscall_test 0 0-1 --set_mempolicy=2 0 || return 1 + fi check_result "1" return $? } test14() { - do_syscall_test 0 0 --set_mempolicy=6 1 || return 1 + if [ $nr_mems -ge 3 ]; then + do_syscall_test 0 0 --set_mempolicy=6 1 || return 1 + else + do_syscall_test 0 0 --set_mempolicy=2 1 || return 1 + fi return 0 } -- 1.7.1 ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
