[RFC,9/9] syscalls/ipc: Fix Makefile

Message ID 20180612154631.435-10-chrubis@suse.cz
State Accepted
Headers show
Series
  • Rewrite msgctl testcases
Related show

Commit Message

Cyril Hrubis June 12, 2018, 3:46 p.m.
Switch to new ipc library now that all testcases are rewritten.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/ipc/msgctl/Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Comments

Petr Vorel June 13, 2018, 12:35 p.m. | #1
Hi Cyril,

> Switch to new ipc library now that all testcases are rewritten.

> Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
> ---

I've noticed, that some commits from this patchset aren't bisectable, due
dependency on new library (libnewipc.h).
IMHO it's worth of fixing it.


Kind regards,
Petr

>  testcases/kernel/syscalls/ipc/msgctl/Makefile | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)

> diff --git a/testcases/kernel/syscalls/ipc/msgctl/Makefile b/testcases/kernel/syscalls/ipc/msgctl/Makefile
> index 4472eeb1c..f9ee8d2c2 100644
> --- a/testcases/kernel/syscalls/ipc/msgctl/Makefile
> +++ b/testcases/kernel/syscalls/ipc/msgctl/Makefile
> @@ -19,11 +19,5 @@
>  top_srcdir              ?= ../../../../..

>  include $(top_srcdir)/include/mk/testcases.mk
> -
> -LIBMSGCTL               := $(LIBDIR)/libmsgctl.a
> -LDLIBS                  += -lmsgctl
> -
> -MAKE_DEPS               := $(LIBMSGCTL)
> -
> -include $(abs_srcdir)/../Makefile.inc
> +include $(abs_srcdir)/../Makefile2.inc
>  include $(top_srcdir)/include/mk/generic_leaf_target.mk
Cyril Hrubis June 20, 2018, 10:48 a.m. | #2
Hi!
> I've noticed, that some commits from this patchset aren't bisectable, due
> dependency on new library (libnewipc.h).
> IMHO it's worth of fixing it.

I guess that the best I can do is to disable the directory from build
before the patchset and enable it with a new Makefile at the end as it's
nearly impossible to mix the new and old IPC library in one Makefile.

And yes I wanted to send this early, so I kind of ignored the build
problems.
Petr Vorel June 20, 2018, 3:26 p.m. | #3
Hi Cyril,

> Hi!
> > I've noticed, that some commits from this patchset aren't bisectable, due
> > dependency on new library (libnewipc.h).
> > IMHO it's worth of fixing it.

> I guess that the best I can do is to disable the directory from build
> before the patchset and enable it with a new Makefile at the end as it's
> nearly impossible to mix the new and old IPC library in one Makefile.
Seems reasonable for me.
Thanks for handling it.

> And yes I wanted to send this early, so I kind of ignored the build
> problems.
No big deal :).


Kind regards,
Petr

Patch

diff --git a/testcases/kernel/syscalls/ipc/msgctl/Makefile b/testcases/kernel/syscalls/ipc/msgctl/Makefile
index 4472eeb1c..f9ee8d2c2 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgctl/Makefile
@@ -19,11 +19,5 @@ 
 top_srcdir              ?= ../../../../..
 
 include $(top_srcdir)/include/mk/testcases.mk
-
-LIBMSGCTL               := $(LIBDIR)/libmsgctl.a
-LDLIBS                  += -lmsgctl
-
-MAKE_DEPS               := $(LIBMSGCTL)
-
-include $(abs_srcdir)/../Makefile.inc
+include $(abs_srcdir)/../Makefile2.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk