2022-05-14 00:09:09

by Waiman Long

Subject: [PATCH] kseltest/cgroup: Make test_stress.sh work if run interactively

Commit 54de76c01239 ("kselftest/cgroup: fix test_stress.sh to use OUTPUT
dir") changes the test_core command path from . to $OUTPUT. However,
variable OUTPUT may not be defined if the command is run interactively.
Fix that by using ${OUTPUT:-.} to cover both cases.

Signed-off-by: Waiman Long <[email protected]>
---
tools/testing/selftests/cgroup/test_stress.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/cgroup/test_stress.sh b/tools/testing/selftests/cgroup/test_stress.sh
index 109c044f715f..3c9c4554d5f6 100755
--- a/tools/testing/selftests/cgroup/test_stress.sh
+++ b/tools/testing/selftests/cgroup/test_stress.sh
@@ -1,4 +1,4 @@
#!/bin/bash
# SPDX-License-Identifier: GPL-2.0

-./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
+./with_stress.sh -s subsys -s fork ${OUTPUT:-.}/test_core
--
2.27.0

2022-05-14 01:44:57

by Phil Auld

Subject: Re: [PATCH] kseltest/cgroup: Make test_stress.sh work if run interactively

On Fri, May 13, 2022 at 03:09:28PM -0400 Waiman Long wrote:
> Commit 54de76c01239 ("kselftest/cgroup: fix test_stress.sh to use OUTPUT
> dir") changes the test_core command path from . to $OUTPUT. However,
> variable OUTPUT may not be defined if the command is run interactively.
> Fix that by using ${OUTPUT:-.} to cover both cases.
>
> Signed-off-by: Waiman Long <[email protected]>
> ---
> tools/testing/selftests/cgroup/test_stress.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/cgroup/test_stress.sh b/tools/testing/selftests/cgroup/test_stress.sh
> index 109c044f715f..3c9c4554d5f6 100755
> --- a/tools/testing/selftests/cgroup/test_stress.sh
> +++ b/tools/testing/selftests/cgroup/test_stress.sh
> @@ -1,4 +1,4 @@
> #!/bin/bash
> # SPDX-License-Identifier: GPL-2.0
>
> -./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
> +./with_stress.sh -s subsys -s fork ${OUTPUT:-.}/test_core
> --
> 2.27.0
>


Thanks Waiman! I did not think to try manually running it.


Cheers,
Phil

--

2022-05-14 03:56:21

by Tejun Heo

Subject: Re: [PATCH] kseltest/cgroup: Make test_stress.sh work if run interactively

On Fri, May 13, 2022 at 03:09:28PM -0400, Waiman Long wrote:
> Commit 54de76c01239 ("kselftest/cgroup: fix test_stress.sh to use OUTPUT
> dir") changes the test_core command path from . to $OUTPUT. However,
> variable OUTPUT may not be defined if the command is run interactively.
> Fix that by using ${OUTPUT:-.} to cover both cases.
>
> Signed-off-by: Waiman Long <[email protected]>

Applied to cgroup/for-5.19.

Thanks, much appreciated.

--
tejun