In order to avoid name collisions with current (and potentially future) upstream changes, rename the epoll_wait05 test. The naming is definitely far from being perfect but t leaves a lot of space for introducing new tests without generating conflicts. Besides, there does not seem to be any other established way of doing that with no clear guidelines on how to specify test descriptor in such cases (even when considering tests sub-grouping). So there it is ...
Signed-off-by: Beata Michalska beata.michalska@arm.com --- runtest/morello_transitional_extended | 2 +- runtest/syscalls | 2 +- testcases/kernel/syscalls/epoll_wait/.gitignore | 2 +- .../syscalls/epoll_wait/{epoll_wait05.c => epoll_wait99.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename testcases/kernel/syscalls/epoll_wait/{epoll_wait05.c => epoll_wait99.c} (100%)
diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index b145d4672..44641a33e 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -33,7 +33,7 @@ epoll_wait01 epoll_wait01 epoll_wait02 epoll_wait02 epoll_wait03 epoll_wait03 epoll_wait04 epoll_wait04 -epoll_wait05 epoll_wait05 +epoll_wait99 epoll_wait99 epoll_pwait01 epoll_pwait01 epoll_pwait02 epoll_pwait02 epoll_pwait03 epoll_pwait03 diff --git a/runtest/syscalls b/runtest/syscalls index 921afe312..abb98b3d2 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -175,7 +175,7 @@ epoll_wait01 epoll_wait01 epoll_wait02 epoll_wait02 epoll_wait03 epoll_wait03 epoll_wait04 epoll_wait04 -epoll_wait05 epoll_wait05 +epoll_wait99 epoll_wait99 epoll_pwait01 epoll_pwait01 epoll_pwait02 epoll_pwait02 epoll_pwait03 epoll_pwait03 diff --git a/testcases/kernel/syscalls/epoll_wait/.gitignore b/testcases/kernel/syscalls/epoll_wait/.gitignore index ab5a9c010..84387a306 100644 --- a/testcases/kernel/syscalls/epoll_wait/.gitignore +++ b/testcases/kernel/syscalls/epoll_wait/.gitignore @@ -2,4 +2,4 @@ epoll_wait01 epoll_wait02 epoll_wait03 epoll_wait04 -epoll_wait05 +epoll_wait99 diff --git a/testcases/kernel/syscalls/epoll_wait/epoll_wait05.c b/testcases/kernel/syscalls/epoll_wait/epoll_wait99.c similarity index 100% rename from testcases/kernel/syscalls/epoll_wait/epoll_wait05.c rename to testcases/kernel/syscalls/epoll_wait/epoll_wait99.c