2020-10-02 08:42:29

by John Hubbard

[permalink] [raw]
Subject: [PATCH v2 0/2] selftests/vm: fix up executable bits, and a file name

Hi,

Here's v2. I can't use $(CONFIG_SHELL) from the Makefile, because
unfortunately this is not kbuild. So this is my proposed fix for these
two glitches.

(Actually, the "Fixes:" tags in each refer to linux-next commits, so
those commit hashes would ultimately need changing. But I suspect these
patches will actually be merged back into Andrew's tree?)

thanks,
John Hubbard
NVIDIA

John Hubbard (2):
selftests/vm: fix: make check_config.sh executable
selftests/vm: fix run_vmtest.sh: restore executable bits, and "s" in
name

tools/testing/selftests/vm/check_config.sh | 0
tools/testing/selftests/vm/{run_vmtest.sh => run_vmtests.sh} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/vm/check_config.sh
rename tools/testing/selftests/vm/{run_vmtest.sh => run_vmtests.sh} (100%)
mode change 100644 => 100755

--
2.28.0


2020-10-02 08:42:37

by John Hubbard

[permalink] [raw]
Subject: [PATCH v2 2/2] selftests/vm: fix run_vmtest.sh: restore executable bits, and "s" in name

commit cb2ab76685d7 ("selftests/vm: rename run_vmtests -->
run_vmtests.sh") changed the name of run_vmtests to run_vmtest.sh, but
inadvertently dropped the executable bits.

Somehow the name is missing an "s", too. Fix both of these problems by
renaming, and restoring the executable bits.

Fixes: cb2ab76685d7 ("selftests/vm: rename run_vmtests --> run_vmtests.sh")
Signed-off-by: John Hubbard <[email protected]>
---
tools/testing/selftests/vm/{run_vmtest.sh => run_vmtests.sh} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename tools/testing/selftests/vm/{run_vmtest.sh => run_vmtests.sh} (100%)
mode change 100644 => 100755

diff --git a/tools/testing/selftests/vm/run_vmtest.sh b/tools/testing/selftests/vm/run_vmtests.sh
old mode 100644
new mode 100755
similarity index 100%
rename from tools/testing/selftests/vm/run_vmtest.sh
rename to tools/testing/selftests/vm/run_vmtests.sh
--
2.28.0

2020-10-02 08:44:50

by John Hubbard

[permalink] [raw]
Subject: [PATCH v2 1/2] selftests/vm: fix: make check_config.sh executable

commit 30fb9454ab23 ("selftests/vm: hmm-tests: remove the libhugetlbfs
dependency") created the new check_config.sh file without the execute
bits set. This is a problem because the Makefile runs it with "./", so
now "make" is failing in that directory.

The posted patch [1] does seem to have it as an executable file, so I'm
not sure how this happened. But in any case, make check_config.sh
executable again, so that "make" in selftests/vm works once again.

[1] https://lore.kernel.org/linux-doc/[email protected]/

Fixes: commit 30fb9454ab23 ("selftests/vm: hmm-tests: remove the libhugetlbfs dependency")
Signed-off-by: John Hubbard <[email protected]>
---
tools/testing/selftests/vm/check_config.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/testing/selftests/vm/check_config.sh

diff --git a/tools/testing/selftests/vm/check_config.sh b/tools/testing/selftests/vm/check_config.sh
old mode 100644
new mode 100755
--
2.28.0

2020-10-02 22:01:55

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] selftests/vm: fix run_vmtest.sh: restore executable bits, and "s" in name

On Fri, 2 Oct 2020 01:40:49 -0700 John Hubbard <[email protected]> wrote:

> commit cb2ab76685d7 ("selftests/vm: rename run_vmtests -->
> run_vmtests.sh") changed the name of run_vmtests to run_vmtest.sh, but
> inadvertently dropped the executable bits.

We cannot depend on the x bit. Because downloading linux-foo.patch.gz
and installing it with patch(1) is a supported way of obtaining Linux.
And patch(1) loses the x bit.

If $(CONFIG_SHELL) is unavailable then invoking the script with
"/bin/sh foo.sh" should do the trick.

> Somehow the name is missing an "s", too. Fix both of these problems by
> renaming, and restoring the executable bits.

But that's what your patch did!

tools/testing/selftests/vm/{run_vmtests => run_vmtest.sh} | 0

Here: https://lkml.kernel.org/r/[email protected]


So all confused. I'll drop this version - please redo and resend when
convenient?

2020-10-02 22:06:21

by John Hubbard

[permalink] [raw]
Subject: Re: [PATCH v2 2/2] selftests/vm: fix run_vmtest.sh: restore executable bits, and "s" in name

On 10/2/20 2:59 PM, Andrew Morton wrote:
> On Fri, 2 Oct 2020 01:40:49 -0700 John Hubbard <[email protected]> wrote:
>
>> commit cb2ab76685d7 ("selftests/vm: rename run_vmtests -->
>> run_vmtests.sh") changed the name of run_vmtests to run_vmtest.sh, but
>> inadvertently dropped the executable bits.
>
> We cannot depend on the x bit. Because downloading linux-foo.patch.gz
> and installing it with patch(1) is a supported way of obtaining Linux.
> And patch(1) loses the x bit.

OK. I was just hoping that, within our processes here, there's still some
way to get something committed that does have the bit set. Because it's a
nice touch to be able to do

./run_vmtests.sh

Not a big deal of course.

>
> If $(CONFIG_SHELL) is unavailable then invoking the script with
> "/bin/sh foo.sh" should do the trick.

OK, I'll use that for the Makefile.

>
>> Somehow the name is missing an "s", too. Fix both of these problems by
>> renaming, and restoring the executable bits.
>
> But that's what your patch did!
>
> tools/testing/selftests/vm/{run_vmtests => run_vmtest.sh} | 0
>
> Here: https://lkml.kernel.org/r/[email protected]
>

Yes, the dropped "s" is my mistake!

>
> So all confused. I'll drop this version - please redo and resend when
> convenient?
>

Coming up, sorry about the mess here!

thanks,
--
John Hubbard
NVIDIA