diff options
| author | Tejun Heo <tj@kernel.org> | 2026-05-10 22:53:08 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-05-10 22:53:08 -1000 |
| commit | c69e4b02131650c8ae4c467a58987ff7c201889b (patch) | |
| tree | 452d48feda171a7c218ad2e7c5bae05ca0e2f669 /tools/testing | |
| parent | 298e7f94fc0350c18801a1cfeb04cd053e78efb5 (diff) | |
| parent | 4a39eda5fdd867fc39f3c039714dd432cee00268 (diff) | |
| download | linux-next-c69e4b02131650c8ae4c467a58987ff7c201889b.tar.gz linux-next-c69e4b02131650c8ae4c467a58987ff7c201889b.zip | |
Merge branch 'for-7.1-fixes' into for-7.2
Pull to receive dde2f938d02f ("cgroup/cpuset: move PF_EXITING check
before __GFP_HARDWALL in cpuset_current_node_allowed()") as a
dependency for an upcoming patch in the same function.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/cgroup/lib/cgroup_util.c | 5 | ||||
| -rwxr-xr-x | tools/testing/selftests/cgroup/test_cpuset_v1_base.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/testing/selftests/cgroup/lib/cgroup_util.c b/tools/testing/selftests/cgroup/lib/cgroup_util.c index 0c5e6d4bbc3a..a7b3380d88d7 100644 --- a/tools/testing/selftests/cgroup/lib/cgroup_util.c +++ b/tools/testing/selftests/cgroup/lib/cgroup_util.c @@ -109,8 +109,9 @@ int cg_read_strcmp(const char *cgroup, const char *control, /* Handle the case of comparing against empty string */ if (!expected) return -1; - else - size = strlen(expected) + 1; + + /* needs size > 1, otherwise cg_read() reads 0 bytes */ + size = (expected[0] == '\0') ? 2 : strlen(expected) + 1; buf = malloc(size); if (!buf) diff --git a/tools/testing/selftests/cgroup/test_cpuset_v1_base.sh b/tools/testing/selftests/cgroup/test_cpuset_v1_base.sh index 42a6628fb8bc..1c0444729e70 100755 --- a/tools/testing/selftests/cgroup/test_cpuset_v1_base.sh +++ b/tools/testing/selftests/cgroup/test_cpuset_v1_base.sh @@ -18,7 +18,7 @@ write_test() { echo "testing $interface $value" echo $value > $dir/$interface new=$(cat $dir/$interface) - [[ $value -ne $(cat $dir/$interface) ]] && { + [[ "$value" != "$new" ]] && { echo "$interface write $value failed: new:$new" exit 1 } |