kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

[PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Phil Auld 4 years ago

Running cgroup kselftest with O= fails to run the with_stress test due
to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.

Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
Signed-off-by: Phil Auld <pauld@redhat.com>
---
 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 15d9d5896394..109c044f715f 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 ./test_core
+./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
-- 
2.18.0

Re: [PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Waiman Long 4 years ago

On 5/12/22 10:34, Phil Auld wrote:
> Running cgroup kselftest with O= fails to run the with_stress test due
> to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.
>
> Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
> Signed-off-by: Phil Auld <pauld@redhat.com>
> ---
>   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 15d9d5896394..109c044f715f 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 ./test_core
> +./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core


I would suggest using "${OUTPUT:-.}" as the variable OUTPUT may not be 
defined if test_stress.sh is run interactively.

Cheers,
Longman

Re: [PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Phil Auld 4 years ago

On Fri, May 13, 2022 at 12:19:24PM -0400 Waiman Long wrote:
> 
> On 5/12/22 10:34, Phil Auld wrote:
> > Running cgroup kselftest with O= fails to run the with_stress test due
> > to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.
> > 
> > Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
> > Signed-off-by: Phil Auld <pauld@redhat.com>
> > ---
> >   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 15d9d5896394..109c044f715f 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 ./test_core
> > +./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
> 
> 
> I would suggest using "${OUTPUT:-.}" as the variable OUTPUT may not be
> defined if test_stress.sh is run interactively.
>

I worked both ways as is.


> Cheers,
> Longman
> 

--

Re: [PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Phil Auld 4 years ago

On Fri, May 13, 2022 at 12:32:15PM -0400 Phil Auld wrote:
> On Fri, May 13, 2022 at 12:19:24PM -0400 Waiman Long wrote:
> > 
> > On 5/12/22 10:34, Phil Auld wrote:
> > > Running cgroup kselftest with O= fails to run the with_stress test due
> > > to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.
> > > 
> > > Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
> > > Signed-off-by: Phil Auld <pauld@redhat.com>
> > > ---
> > >   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 15d9d5896394..109c044f715f 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 ./test_core
> > > +./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
> > 
> > 
> > I would suggest using "${OUTPUT:-.}" as the variable OUTPUT may not be
> > defined if test_stress.sh is run interactively.
> >
> 
> I worked both ways as is.
> 
>

But I'm not sure why :)  Yours is probably better.


Cheers,
Phil


> > Cheers,
> > Longman
> > 
> 
> -- 

--

Re: [PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Tejun Heo 4 years ago

Can you send a quick patch?

Thanks.

On Fri, May 13, 2022 at 6:19 AM Waiman Long <longman@redhat.com> wrote:
>
>
> On 5/12/22 10:34, Phil Auld wrote:
> > Running cgroup kselftest with O= fails to run the with_stress test due
> > to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.
> >
> > Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
> > Signed-off-by: Phil Auld <pauld@redhat.com>
> > ---
> >   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 15d9d5896394..109c044f715f 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 ./test_core
> > +./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
>
>
> I would suggest using "${OUTPUT:-.}" as the variable OUTPUT may not be
> defined if test_stress.sh is run interactively.
>
> Cheers,
> Longman
>


-- 
tejun

Re: [PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Waiman Long 4 years ago

On 5/13/22 12:20, Tejun Heo wrote:
> Can you send a quick patch?

Will do.

Cheers,
Longman

>
> Thanks.
>
> On Fri, May 13, 2022 at 6:19 AM Waiman Long <longman@redhat.com> wrote:
>>
>> On 5/12/22 10:34, Phil Auld wrote:
>>> Running cgroup kselftest with O= fails to run the with_stress test due
>>> to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.
>>>
>>> Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
>>> Signed-off-by: Phil Auld <pauld@redhat.com>
>>> ---
>>>    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 15d9d5896394..109c044f715f 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 ./test_core
>>> +./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
>>
>> I would suggest using "${OUTPUT:-.}" as the variable OUTPUT may not be
>> defined if test_stress.sh is run interactively.
>>
>> Cheers,
>> Longman
>>
>

Re: [PATCH] kselftest/cgroup: fix test_stress.sh to use OUTPUT dir

Posted by Tejun Heo 4 years ago

On Thu, May 12, 2022 at 10:34:39AM -0400, Phil Auld wrote:
> Running cgroup kselftest with O= fails to run the with_stress test due
> to hardcoded ./test_core. Find test_core binary using the OUTPUT directory.
> 
> Fixes: 1a99fcc035fb ("selftests: cgroup: Run test_core under interfering stress")
> Signed-off-by: Phil Auld <pauld@redhat.com>

Applied to cgroup/for-5.19.

Thanks.

-- 
tejun