setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert to new LTP API") and now assumes that LTP runs in a different session from init (PID 1) for the EPERM test case. This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip the EPERM test case for the morello release 1.6.0 while waiting for a fix to be decided with upstream. This mostly doesn't impact test coverage as EPERM is also tested for in setpgid03.
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com --- testcases/kernel/syscalls/setpgid/setpgid02.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c index 4b63afee8..fe68361aa 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid02.c +++ b/testcases/kernel/syscalls/setpgid/setpgid02.c @@ -31,7 +31,12 @@ static struct tcase { } tcases[] = { {&pid, &negative_pid, EINVAL}, {&ppid, &pgid, ESRCH}, - {&pid, &init_pgid, EPERM} + /* + * This test case makes an assumption that is invalid in our CI. + * Skip it for now as the error case is covered in setpgid03 anyway. + * Should be restored when the fix is decided with upstream. + */ +/* {&pid, &init_pgid, EPERM} */ };
static void setup(void)
On 12-04-2023 10:15, Teo Couprie Diaz wrote:
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert to new LTP API") and now assumes that LTP runs in a different session from init (PID 1) for the EPERM test case. This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip the EPERM test case for the morello release 1.6.0 while waiting for a fix to be decided with upstream. This mostly doesn't impact test coverage as EPERM is also tested for in setpgid03.
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com
LGTM!
Tudor
testcases/kernel/syscalls/setpgid/setpgid02.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c index 4b63afee8..fe68361aa 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid02.c +++ b/testcases/kernel/syscalls/setpgid/setpgid02.c @@ -31,7 +31,12 @@ static struct tcase { } tcases[] = { {&pid, &negative_pid, EINVAL}, {&ppid, &pgid, ESRCH},
- {&pid, &init_pgid, EPERM}
- /*
* This test case makes an assumption that is invalid in our CI.* Skip it for now as the error case is covered in setpgid03 anyway.* Should be restored when the fix is decided with upstream.*/+/* {&pid, &init_pgid, EPERM} */ }; static void setup(void)
On 12/04/2023 11:15, Teo Couprie Diaz wrote:
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert to new LTP API") and now assumes that LTP runs in a different session from init (PID 1) for the EPERM test case. This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip the EPERM test case for the morello release 1.6.0 while waiting for a fix to be decided with upstream. This mostly doesn't impact test coverage as EPERM is also tested for in setpgid03.
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com
testcases/kernel/syscalls/setpgid/setpgid02.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c index 4b63afee8..fe68361aa 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid02.c +++ b/testcases/kernel/syscalls/setpgid/setpgid02.c @@ -31,7 +31,12 @@ static struct tcase { } tcases[] = { {&pid, &negative_pid, EINVAL}, {&ppid, &pgid, ESRCH},
- {&pid, &init_pgid, EPERM}
- /*
* This test case makes an assumption that is invalid in our CI.
I would put a TODO/FIXME here, because clearly this comment is not there to stay. It would also be good to make it clear in the commit title that this is a temporary workaround.
Kevin
* Skip it for now as the error case is covered in setpgid03 anyway.* Should be restored when the fix is decided with upstream.*/+/* {&pid, &init_pgid, EPERM} */ }; static void setup(void)
On 12/04/2023 11:04, Kevin Brodsky wrote:
On 12/04/2023 11:15, Teo Couprie Diaz wrote:
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert to new LTP API") and now assumes that LTP runs in a different session from init (PID 1) for the EPERM test case. This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip the EPERM test case for the morello release 1.6.0 while waiting for a fix to be decided with upstream. This mostly doesn't impact test coverage as EPERM is also tested for in setpgid03.
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com
testcases/kernel/syscalls/setpgid/setpgid02.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c index 4b63afee8..fe68361aa 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid02.c +++ b/testcases/kernel/syscalls/setpgid/setpgid02.c @@ -31,7 +31,12 @@ static struct tcase { } tcases[] = { {&pid, &negative_pid, EINVAL}, {&ppid, &pgid, ESRCH},
- {&pid, &init_pgid, EPERM}
- /*
* This test case makes an assumption that is invalid in our CI.I would put a TODO/FIXME here, because clearly this comment is not there to stay. It would also be good to make it clear in the commit title that this is a temporary workaround.
That's fair, I was wondering how much to highlight the temporary nature of the change. Added FIXME and an indication of temporariness in the title for v2.
Kevin
Thanks for the review, Téo
* Skip it for now as the error case is covered in setpgid03 anyway.* Should be restored when the fix is decided with upstream.*/+/* {&pid, &init_pgid, EPERM} */ }; static void setup(void)
linux-morello-ltp@op-lists.linaro.org
-
Kevin Brodsky -
Teo Couprie Diaz -
Tudor Cretu