]> www.infradead.org Git - users/hch/misc.git/commitdiff
selftests/mm: fix check for running THP tests
authorMark Brown <broonie@kernel.org>
Wed, 12 Feb 2025 17:44:25 +0000 (17:44 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Tue, 18 Feb 2025 06:40:04 +0000 (22:40 -0800)
When testing if we should try to compact memory or drop caches before we
run the THP or HugeTLB tests we use | as an or operator.  This doesn't
work since run_vmtests.sh is written in shell where this is used to pipe
the output of the first argument into the second.  Instead use the shell's
-o operator.

Link: https://lkml.kernel.org/r/20250212-kselftest-mm-no-hugepages-v1-1-44702f538522@kernel.org
Fixes: b433ffa8dbac ("selftests: mm: perform some system cleanup before using hugepages")
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Nico Pache <npache@redhat.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
tools/testing/selftests/mm/run_vmtests.sh

index 333c468c26991421cd8f9ce6d995f9b64b0643c7..da7e266681031d2772fb0c4139648904a18e0bf9 100755 (executable)
@@ -220,7 +220,7 @@ run_test() {
        if test_selected ${CATEGORY}; then
                # On memory constrainted systems some tests can fail to allocate hugepages.
                # perform some cleanup before the test for a higher success rate.
-               if [ ${CATEGORY} == "thp" ] | [ ${CATEGORY} == "hugetlb" ]; then
+               if [ ${CATEGORY} == "thp" -o ${CATEGORY} == "hugetlb" ]; then
                        echo 3 > /proc/sys/vm/drop_caches
                        sleep 2
                        echo 1 > /proc/sys/vm/compact_memory