[Xen-devel] [PATCH] livepatch: Fix typos and other errors in tests Makefile

[Xen-devel] [PATCH] livepatch: Fix typos and other errors in tests Makefile

[Pawel Wieczorkiewicz]

There was a bunch of typos (s/actions/action/) as well as one missing
config.h target dependency. Also, xen_expectation target has
unnecessary cycle dependency.

Signed-off-by: Pawel Wieczorkiewicz <wipawel@amazon.de>
---
 xen/test/livepatch/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile
index ebb343c314..82a076aac1 100644
--- a/xen/test/livepatch/Makefile
+++ b/xen/test/livepatch/Makefile
@@ -166,29 +166,31 @@ xen_prepost_hooks_fail.o: config.h
 $(LIVEPATCH_PREPOST_HOOKS_FAIL): xen_prepost_hooks_fail.o xen_hello_world_func.o note.o xen_note.o
 	$(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_PREPOST_HOOKS_FAIL) $^
 
-xen_actions_hooks.o: config.h
+xen_action_hooks.o: config.h
 
 .PHONY: $(LIVEPATCH_ACTION_HOOKS)
 $(LIVEPATCH_ACTION_HOOKS): xen_action_hooks.o xen_hello_world_func.o note.o xen_note.o
 	$(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS) $^
 
+xen_action_hooks_nofunc.o: config.h
+
 .PHONY: $(LIVEPATCH_ACTION_HOOKS_NOFUNC)
 $(LIVEPATCH_ACTION_HOOKS_NOFUNC): xen_action_hooks_nofunc.o note.o xen_note.o
 	$(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS_NOFUNC) $^
 
-xen_actions_hooks_marker.o: config.h
+xen_action_hooks_marker.o: config.h
 
 .PHONY: $(LIVEPATCH_ACTION_HOOKS_MARKER)
 $(LIVEPATCH_ACTION_HOOKS_MARKER): xen_action_hooks_marker.o xen_hello_world_func.o note.o xen_note.o
 	$(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS_MARKER) $^
 
-xen_actions_hooks_noapply.o: config.h
+xen_action_hooks_noapply.o: config.h
 
 .PHONY: $(LIVEPATCH_ACTION_HOOKS_NOAPPLY)
 $(LIVEPATCH_ACTION_HOOKS_NOAPPLY): xen_action_hooks_marker.o xen_hello_world_func.o note.o xen_note.o
 	$(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_ACTION_HOOKS_NOAPPLY) $^
 
-xen_actions_hooks_norevert.o: config.h
+xen_action_hooks_norevert.o: config.h
 
 .PHONY: $(LIVEPATCH_ACTION_HOOKS_NOREVERT)
 $(LIVEPATCH_ACTION_HOOKS_NOREVERT): xen_action_hooks_marker.o xen_hello_world_func.o note.o xen_note.o
@@ -198,7 +200,7 @@ EXPECT_BYTES_COUNT := 8
 CODE_GET_EXPECT=$(shell $(OBJDUMP) -d --insn-width=1 $(1) | sed -n -e '/<'$(2)'>:$$/,/^$$/ p' | tail -n +2 | head -n $(EXPECT_BYTES_COUNT) | awk '{$$0=$$2; printf "%s", substr($$0,length-1)}' | sed 's/.\{2\}/0x&,/g' | sed 's/^/{/;s/,$$/}/g')
 .PHONY: expect_config.h
 expect_config.h: EXPECT_BYTES=$(call CODE_GET_EXPECT,$(BASEDIR)/xen-syms,xen_extra_version)
-expect_config.h: xen_expectations.o
+expect_config.h:
 	(set -e; \
 	 echo "#define EXPECT_BYTES $(EXPECT_BYTES)"; \
          echo "#define EXPECT_BYTES_COUNT $(EXPECT_BYTES_COUNT)") > $@
-- 
2.16.5




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] livepatch: Fix typos and other errors in tests Makefile

[Julien Grall]

Hi Pawel,

Thank you for fixing the build.

On 20/12/2019 18:23, Pawel Wieczorkiewicz wrote:
> There was a bunch of typos (s/actions/action/) as well as one missing
> config.h target dependency. Also, xen_expectation target has
> unnecessary cycle dependency.

I would suggest to mention which commit your are fixing. I guess there 
are multiple ones, but we could just mention the merge (it is at least 
useful for something!).

I guess this could be fixed on commit.

> 
> Signed-off-by: Pawel Wieczorkiewicz <wipawel@amazon.de>

Tested-by: Julien Grall <julien@xen.org>

Cheers,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] livepatch: Fix typos and other errors in tests Makefile

[Konrad Rzeszutek Wilk]

On Fri, Dec 20, 2019 at 07:15:33PM +0000, Julien Grall wrote:
> Hi Pawel,
> 
> Thank you for fixing the build.
> 
> On 20/12/2019 18:23, Pawel Wieczorkiewicz wrote:
> > There was a bunch of typos (s/actions/action/) as well as one missing
> > config.h target dependency. Also, xen_expectation target has
> > unnecessary cycle dependency.
> 
> I would suggest to mention which commit your are fixing. I guess there are
> multiple ones, but we could just mention the merge (it is at least useful
> for something!).
> 
> I guess this could be fixed on commit.
> 
> > 
> > Signed-off-by: Pawel Wieczorkiewicz <wipawel@amazon.de>
> 
> Tested-by: Julien Grall <julien@xen.org>


Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

But I see it is already checked in. Thank you for fixing that!
> 
> Cheers,
> 
> -- 
> Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel