| Message ID | 20200302181907.32110-2-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next updates (tweaks and re-greening) | expand |
On 3/2/20 7:18 PM, Alex Bennée wrote: > From: Robert Foley <robert.foley@linaro.org> > > Change Makefile.include to use $(PYTHON) so for vm-boot-ssh to be > consistent with other cases like vm-build. So what you are trying to fix here is when you have two python3 installed (one from the distribution and one manually built), and you want to use the manually built? > > Signed-off-by: Robert Foley <robert.foley@linaro.org> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Peter Puhov <peter.puhov@linaro.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20200219163537.22098-2-robert.foley@linaro.org> > --- > tests/vm/Makefile.include | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include > index 9e7c46a4735..778e5067554 100644 > --- a/tests/vm/Makefile.include > +++ b/tests/vm/Makefile.include > @@ -80,7 +80,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img > > vm-boot-ssh-%: $(IMAGES_DIR)/%.img > $(call quiet-command, \ > - $(SRC_PATH)/tests/vm/$* \ > + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ > $(if $(J),--jobs $(J)) \ > --image "$<" \ > --interactive \ >
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > On 3/2/20 7:18 PM, Alex Bennée wrote: >> From: Robert Foley <robert.foley@linaro.org> >> Change Makefile.include to use $(PYTHON) so for vm-boot-ssh to be >> consistent with other cases like vm-build. > > So what you are trying to fix here is when you have two python3 > installed (one from the distribution and one manually built), and you > want to use the manually built? No - just consistency with the rest of the build system. > >> Signed-off-by: Robert Foley <robert.foley@linaro.org> >> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >> Reviewed-by: Peter Puhov <peter.puhov@linaro.org> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Message-Id: <20200219163537.22098-2-robert.foley@linaro.org> >> --- >> tests/vm/Makefile.include | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include >> index 9e7c46a4735..778e5067554 100644 >> --- a/tests/vm/Makefile.include >> +++ b/tests/vm/Makefile.include >> @@ -80,7 +80,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img >> vm-boot-ssh-%: $(IMAGES_DIR)/%.img >> $(call quiet-command, \ >> - $(SRC_PATH)/tests/vm/$* \ >> + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ >> $(if $(J),--jobs $(J)) \ >> --image "$<" \ >> --interactive \ >> -- Alex Bennée
On 3/2/20 7:41 PM, Alex Bennée wrote: > > Philippe Mathieu-Daudé <philmd@redhat.com> writes: > >> On 3/2/20 7:18 PM, Alex Bennée wrote: >>> From: Robert Foley <robert.foley@linaro.org> >>> Change Makefile.include to use $(PYTHON) so for vm-boot-ssh to be >>> consistent with other cases like vm-build. >> >> So what you are trying to fix here is when you have two python3 >> installed (one from the distribution and one manually built), and you >> want to use the manually built? > > No - just consistency with the rest of the build system. This patch was first posted on 2/5/20 but it shouldn't be necessary since: commit c88ee46cdb9888fbe9ea45c174743d6f7544b737 Date: Thu Jan 30 17:32:24 2020 +0100 tests: Explicit usage of Python 3 Use the program search path to find the Python 3 interpreter. Anyway consistency is good: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > >> >>> Signed-off-by: Robert Foley <robert.foley@linaro.org> >>> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> >>> Reviewed-by: Peter Puhov <peter.puhov@linaro.org> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>> Message-Id: <20200219163537.22098-2-robert.foley@linaro.org> >>> --- >>> tests/vm/Makefile.include | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include >>> index 9e7c46a4735..778e5067554 100644 >>> --- a/tests/vm/Makefile.include >>> +++ b/tests/vm/Makefile.include >>> @@ -80,7 +80,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img >>> vm-boot-ssh-%: $(IMAGES_DIR)/%.img >>> $(call quiet-command, \ >>> - $(SRC_PATH)/tests/vm/$* \ >>> + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ >>> $(if $(J),--jobs $(J)) \ >>> --image "$<" \ >>> --interactive \ >>> > >
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 9e7c46a4735..778e5067554 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -80,7 +80,7 @@ vm-boot-serial-%: $(IMAGES_DIR)/%.img vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(call quiet-command, \ - $(SRC_PATH)/tests/vm/$* \ + $(PYTHON) $(SRC_PATH)/tests/vm/$* \ $(if $(J),--jobs $(J)) \ --image "$<" \ --interactive \