Skip to content

Commit 0556945

Browse files
mdouchapevik
authored andcommitted
cpuset_memory: Print basic subtest descriptions
The cpuset_memory tests has multiple subtests. Print short description before each subtest to simplify debugging. The last three subtests have the same description because they differ only in the specific pattern of signals sent to the parent and child allocator threads. Link: https://lore.kernel.org/ltp/20251216173053.29112-1-mdoucha@suse.cz/ Reviewed-by: Petr Vorel <pvorel@suse.cz> Signed-off-by: Martin Doucha <mdoucha@suse.cz> [ pvorel: Print also number of the test ] Signed-off-by: Petr Vorel <pvorel@suse.cz>
1 parent 2d066ea commit 0556945

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ simple_getresult()
6363

6464
test1()
6565
{
66+
tst_resm TINFO "$1: Testing anonymous memory allocation on node 0"
6667
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
6768
if [ $? -ne 0 ]; then
6869
cpuset_log_error $CPUSET_TMP/stderr
@@ -80,6 +81,7 @@ test1()
8081

8182
test2()
8283
{
84+
tst_resm TINFO "$1: Testing file memory allocation on node 0"
8385
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
8486
if [ $? -ne 0 ]; then
8587
cpuset_log_error $CPUSET_TMP/stderr
@@ -97,6 +99,7 @@ test2()
9799

98100
test3()
99101
{
102+
tst_resm TINFO "$1: Testing SHM memory allocation on node 0"
100103
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
101104
if [ $? -ne 0 ]; then
102105
cpuset_log_error $CPUSET_TMP/stderr
@@ -114,6 +117,7 @@ test3()
114117

115118
test4()
116119
{
120+
tst_resm TINFO "$1: Testing pre-mlocked anonymous memory allocation on node 0"
117121
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
118122
if [ $? -ne 0 ]; then
119123
cpuset_log_error $CPUSET_TMP/stderr
@@ -131,6 +135,7 @@ test4()
131135

132136
test5()
133137
{
138+
tst_resm TINFO "$1: Testing mlocked anonymous memory allocation on node 0"
134139
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
135140
if [ $? -ne 0 ]; then
136141
cpuset_log_error $CPUSET_TMP/stderr
@@ -162,6 +167,7 @@ check_hugetlbfs()
162167

163168
test6()
164169
{
170+
tst_resm TINFO "$1: Testing hugepage SHM memory allocation on node 0"
165171
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
166172
if [ $? -ne 0 ]; then
167173
cpuset_log_error $CPUSET_TMP/stderr
@@ -201,6 +207,7 @@ test6()
201207

202208
test7()
203209
{
210+
tst_resm TINFO "$1: Testing anonymous memory allocation on node 0"
204211
cpuset_set "$CPUSET/0" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
205212
if [ $? -ne 0 ]; then
206213
cpuset_log_error $CPUSET_TMP/stderr
@@ -218,6 +225,7 @@ test7()
218225

219226
test8()
220227
{
228+
tst_resm TINFO "$1: Testing anonymous memory allocation on node 1"
221229
cpuset_set "$CPUSET/0" "$cpu_of_node0" "1" "0" 2> $CPUSET_TMP/stderr
222230
if [ $? -ne 0 ]; then
223231
cpuset_log_error $CPUSET_TMP/stderr
@@ -254,6 +262,7 @@ talk2memory_test_for_case_10_11()
254262

255263
test9()
256264
{
265+
tst_resm TINFO "$1: Testing anonymous memory allocation in multiple cpusets"
257266
cpuset_set "$CPUSET/1" "$cpus_all" "0" "0" 2> $CPUSET_TMP/stderr
258267
if [ $? -ne 0 ]; then
259268
cpuset_log_error $CPUSET_TMP/stderr
@@ -292,6 +301,7 @@ test9()
292301

293302
test10()
294303
{
304+
tst_resm TINFO "$1: Testing anonymous memory allocation in multiple cpusets with migration"
295305
cpuset_set "$CPUSET/1" "$cpus_all" "0" "0" 2> $CPUSET_TMP/stderr
296306
if [ $? -ne 0 ]; then
297307
cpuset_log_error $CPUSET_TMP/stderr
@@ -358,6 +368,7 @@ talk2memory_test_for_case_12_13()
358368

359369
test11()
360370
{
371+
tst_resm TINFO "$1: Testing anonymous memory allocation on multiple nodes without migration"
361372
cpuset_set "$CPUSET/0" "$cpu_of_node0" "1" "0" 2> $CPUSET_TMP/stderr
362373
if [ $? -ne 0 ]; then
363374
cpuset_log_error $CPUSET_TMP/stderr
@@ -386,6 +397,7 @@ test11()
386397

387398
test12()
388399
{
400+
tst_resm TINFO "$1: Testing anonymous memory allocation on multiple nodes with migration"
389401
cpuset_set "$CPUSET/0" "$cpu_of_node0" "1" "0" 2> $CPUSET_TMP/stderr
390402
if [ $? -ne 0 ]; then
391403
cpuset_log_error $CPUSET_TMP/stderr
@@ -442,6 +454,7 @@ get_the_second()
442454

443455
test13()
444456
{
457+
tst_resm TINFO "$1: Testing anonymous memory allocation in multiple cpusets with threads"
445458
cpuset_set "$CPUSET/1" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
446459
if [ $? -ne 0 ]; then
447460
cpuset_log_error $CPUSET_TMP/stderr
@@ -490,6 +503,7 @@ test13()
490503

491504
test14()
492505
{
506+
tst_resm TINFO "$1: Testing anonymous memory allocation in multiple cpusets with threads and migration"
493507
cpuset_set "$CPUSET/1" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
494508
if [ $? -ne 0 ]; then
495509
cpuset_log_error $CPUSET_TMP/stderr
@@ -546,6 +560,7 @@ test14()
546560

547561
test15()
548562
{
563+
tst_resm TINFO "$1: Testing anonymous memory reallocation in multiple cpusets with threads and migration"
549564
cpuset_set "$CPUSET/1" "$cpu_of_node0" "0" "0" 2> $CPUSET_TMP/stderr
550565
if [ $? -ne 0 ]; then
551566
cpuset_log_error $CPUSET_TMP/stderr
@@ -613,6 +628,7 @@ test15()
613628

614629
test16()
615630
{
631+
tst_resm TINFO "$1: Testing anonymous memory reallocation in multiple cpusets with threads and migration"
616632
cpuset_set "$CPUSET/1" "$cpu_of_node0" "1" "0" 2> $CPUSET_TMP/stderr
617633
if [ $? -ne 0 ]; then
618634
cpuset_log_error $CPUSET_TMP/stderr
@@ -688,6 +704,7 @@ test16()
688704

689705
test17()
690706
{
707+
tst_resm TINFO "$1: Testing anonymous memory reallocation in multiple cpusets with threads and migration"
691708
cpuset_set "$CPUSET/1" "$cpu_of_node0" "1" "0" 2> $CPUSET_TMP/stderr
692709
if [ $? -ne 0 ]; then
693710
cpuset_log_error $CPUSET_TMP/stderr
@@ -774,7 +791,7 @@ do
774791
if [ $? -ne 0 ]; then
775792
exit_status=1
776793
else
777-
test$c
794+
test$c $c
778795
if [ $? -ne 0 ]; then
779796
exit_status=1
780797
cleanup

0 commit comments

Comments
 (0)