[Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Yonghong Zhu]

Cover the case use do make -C BaseTools before run the .edksetup.sh
file.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Tests/GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile
index af334a8a..536f0b7 100644
--- a/BaseTools/Tests/GNUmakefile
+++ b/BaseTools/Tests/GNUmakefile
@@ -12,10 +12,10 @@
 #
 
 all: test
 
 test:
-	@if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
+	@if command -v python3 >/dev/null 2>&1; then python3 RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
 
 clean:
 	find . -name '*.pyc' -exec rm '{}' ';'
 
-- 
2.6.1.windows.1

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Ard Biesheuvel]

On 13 October 2018 at 18:40, Yonghong Zhu <yonghong.zhu@intel.com> wrote:
> Cover the case use do make -C BaseTools before run the .edksetup.sh
> file.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  BaseTools/Tests/GNUmakefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile
> index af334a8a..536f0b7 100644
> --- a/BaseTools/Tests/GNUmakefile
> +++ b/BaseTools/Tests/GNUmakefile
> @@ -12,10 +12,10 @@
>  #
>
>  all: test
>
>  test:
> -       @if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
> +       @if command -v python3 >/dev/null 2>&1; then python3 RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
>
>  clean:
>         find . -name '*.pyc' -exec rm '{}' ';'
>
> --
> 2.6.1.windows.1
>

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Zhu, Yonghong]

Hi Ard,

Thanks. I pushed this patch since it is critical block issue.
Version SHA-1: 678f85131238622e576705117e299d81cff755c9

Best Regards,
Zhu Yonghong

-----Original Message-----
From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] 
Sent: Sunday, October 14, 2018 12:44 AM
To: Zhu, Yonghong <yonghong.zhu@intel.com>
Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

On 13 October 2018 at 18:40, Yonghong Zhu <yonghong.zhu@intel.com> wrote:
> Cover the case use do make -C BaseTools before run the .edksetup.sh 
> file.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---
>  BaseTools/Tests/GNUmakefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile 
> index af334a8a..536f0b7 100644
> --- a/BaseTools/Tests/GNUmakefile
> +++ b/BaseTools/Tests/GNUmakefile
> @@ -12,10 +12,10 @@
>  #
>
>  all: test
>
>  test:
> -       @if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
> +       @if command -v python3 >/dev/null 2>&1; then python3 
> + RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
>
>  clean:
>         find . -name '*.pyc' -exec rm '{}' ';'
>
> --
> 2.6.1.windows.1
>

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Leif Lindholm]

Hi Yonghong,

Please revert this patch. The broken state of the master branch must
be undone, not hacked on until individual bits seem to work.

Plese do no further work on the master branch until the contents of
the tree is identical to what it was at
301402fa4797ac3a141e575329ca2ea91756414c. (I am not talking about a
git push -f, I am talking about a git revert.)

Best Regards,

Leif

On Sat, Oct 13, 2018 at 04:53:21PM +0000, Zhu, Yonghong wrote:
> Hi Ard,
> 
> Thanks. I pushed this patch since it is critical block issue.
> Version SHA-1: 678f85131238622e576705117e299d81cff755c9
> 
> Best Regards,
> Zhu Yonghong
> 
> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org] 
> Sent: Sunday, October 14, 2018 12:44 AM
> To: Zhu, Yonghong <yonghong.zhu@intel.com>
> Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindholm@linaro.org>
> Subject: Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable
> 
> On 13 October 2018 at 18:40, Yonghong Zhu <yonghong.zhu@intel.com> wrote:
> > Cover the case use do make -C BaseTools before run the .edksetup.sh 
> > file.
> >
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> 
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> > ---
> >  BaseTools/Tests/GNUmakefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile 
> > index af334a8a..536f0b7 100644
> > --- a/BaseTools/Tests/GNUmakefile
> > +++ b/BaseTools/Tests/GNUmakefile
> > @@ -12,10 +12,10 @@
> >  #
> >
> >  all: test
> >
> >  test:
> > -       @if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
> > +       @if command -v python3 >/dev/null 2>&1; then python3 
> > + RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
> >
> >  clean:
> >         find . -name '*.pyc' -exec rm '{}' ';'
> >
> > --
> > 2.6.1.windows.1
> >

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Laszlo Ersek]

On 10/13/18 22:40, Leif Lindholm wrote:
> Hi Yonghong,
> 
> Please revert this patch. The broken state of the master branch must
> be undone, not hacked on until individual bits seem to work.
> 
> Plese do no further work on the master branch until the contents of
> the tree is identical to what it was at
> 301402fa4797ac3a141e575329ca2ea91756414c. (I am not talking about a
> git push -f, I am talking about a git revert.)

+1

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Gao, Liming]

Leif:
  OK. I will move this patch set to edk2 staging repo for people verification. 
  I will use git revert command to revert total 27 patches one by one. Then, there will be 27 commit for the revert patches. Or, one commit to combine all revert patches. One commit is enough. Do you agree it? 

  Below is the commit message for the revert patch. Could you help review it?
  Python3 migration is the fundamental change. It requires every developer to install Python3. Before this migration, the well communication and wide verification must be done. But now, most people is not aware of this change, and not try it. So, Python3 migration is reverted and be moved to edk2-staging Python3 branch for the edk2 user evaluation. 

Thanks
Liming
> -----Original Message-----
> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> Sent: Sunday, October 14, 2018 4:40 AM
> To: Zhu, Yonghong <yonghong.zhu@intel.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>
> Subject: Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable
> 
> Hi Yonghong,
> 
> Please revert this patch. The broken state of the master branch must
> be undone, not hacked on until individual bits seem to work.
> 
> Plese do no further work on the master branch until the contents of
> the tree is identical to what it was at
> 301402fa4797ac3a141e575329ca2ea91756414c. (I am not talking about a
> git push -f, I am talking about a git revert.)
> 
> Best Regards,
> 
> Leif
> 
> On Sat, Oct 13, 2018 at 04:53:21PM +0000, Zhu, Yonghong wrote:
> > Hi Ard,
> >
> > Thanks. I pushed this patch since it is critical block issue.
> > Version SHA-1: 678f85131238622e576705117e299d81cff755c9
> >
> > Best Regards,
> > Zhu Yonghong
> >
> > -----Original Message-----
> > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> > Sent: Sunday, October 14, 2018 12:44 AM
> > To: Zhu, Yonghong <yonghong.zhu@intel.com>
> > Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindholm@linaro.org>
> > Subject: Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable
> >
> > On 13 October 2018 at 18:40, Yonghong Zhu <yonghong.zhu@intel.com> wrote:
> > > Cover the case use do make -C BaseTools before run the .edksetup.sh
> > > file.
> > >
> > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> >
> > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >
> > > ---
> > >  BaseTools/Tests/GNUmakefile | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile
> > > index af334a8a..536f0b7 100644
> > > --- a/BaseTools/Tests/GNUmakefile
> > > +++ b/BaseTools/Tests/GNUmakefile
> > > @@ -12,10 +12,10 @@
> > >  #
> > >
> > >  all: test
> > >
> > >  test:
> > > -       @if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
> > > +       @if command -v python3 >/dev/null 2>&1; then python3
> > > + RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
> > >
> > >  clean:
> > >         find . -name '*.pyc' -exec rm '{}' ';'
> > >
> > > --
> > > 2.6.1.windows.1
> > >

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Leif Lindholm]

On Sun, Oct 14, 2018 at 02:51:06PM +0000, Gao, Liming wrote:
> Leif:
>   OK. I will move this patch set to edk2 staging repo for people
>   verification.

Thats sounds like a good idea.

>   I will use git revert command to revert total 27 patches one by
>   one. Then, there will be 27 commit for the revert patches. Or, one
>   commit to combine all revert patches. One commit is enough. Do you
>   agree it?

On commit is enough.

>   Below is the commit message for the revert patch. Could you help
>   review it?
>   Python3 migration is the fundamental change. It requires every
>   developer to install Python3. Before this migration, the well
>   communication and wide verification must be done. But now, most
>   people is not aware of this change, and not try it. So, Python3
>   migration is reverted and be moved to edk2-staging Python3 branch
>   for the edk2 user evaluation.

This looks good to me, thanks!

Regards,

Leif

> Thanks
> Liming
> > -----Original Message-----
> > From: Leif Lindholm [mailto:leif.lindholm@linaro.org]
> > Sent: Sunday, October 14, 2018 4:40 AM
> > To: Zhu, Yonghong <yonghong.zhu@intel.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>; edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>
> > Subject: Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable
> > 
> > Hi Yonghong,
> > 
> > Please revert this patch. The broken state of the master branch must
> > be undone, not hacked on until individual bits seem to work.
> > 
> > Plese do no further work on the master branch until the contents of
> > the tree is identical to what it was at
> > 301402fa4797ac3a141e575329ca2ea91756414c. (I am not talking about a
> > git push -f, I am talking about a git revert.)
> > 
> > Best Regards,
> > 
> > Leif
> > 
> > On Sat, Oct 13, 2018 at 04:53:21PM +0000, Zhu, Yonghong wrote:
> > > Hi Ard,
> > >
> > > Thanks. I pushed this patch since it is critical block issue.
> > > Version SHA-1: 678f85131238622e576705117e299d81cff755c9
> > >
> > > Best Regards,
> > > Zhu Yonghong
> > >
> > > -----Original Message-----
> > > From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> > > Sent: Sunday, October 14, 2018 12:44 AM
> > > To: Zhu, Yonghong <yonghong.zhu@intel.com>
> > > Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindholm@linaro.org>
> > > Subject: Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable
> > >
> > > On 13 October 2018 at 18:40, Yonghong Zhu <yonghong.zhu@intel.com> wrote:
> > > > Cover the case use do make -C BaseTools before run the .edksetup.sh
> > > > file.
> > > >
> > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > > Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> > >
> > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >
> > > > ---
> > > >  BaseTools/Tests/GNUmakefile | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile
> > > > index af334a8a..536f0b7 100644
> > > > --- a/BaseTools/Tests/GNUmakefile
> > > > +++ b/BaseTools/Tests/GNUmakefile
> > > > @@ -12,10 +12,10 @@
> > > >  #
> > > >
> > > >  all: test
> > > >
> > > >  test:
> > > > -       @if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
> > > > +       @if command -v python3 >/dev/null 2>&1; then python3
> > > > + RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
> > > >
> > > >  clean:
> > > >         find . -name '*.pyc' -exec rm '{}' ';'
> > > >
> > > > --
> > > > 2.6.1.windows.1
> > > >

Re: [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
> Sent: Sunday, October 14, 2018 12:40 AM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch] BaseTools/Tests: Update GNUmakefile to use python3 variable
> 
> Cover the case use do make -C BaseTools before run the .edksetup.sh
> file.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Tests/GNUmakefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Tests/GNUmakefile b/BaseTools/Tests/GNUmakefile
> index af334a8a..536f0b7 100644
> --- a/BaseTools/Tests/GNUmakefile
> +++ b/BaseTools/Tests/GNUmakefile
> @@ -12,10 +12,10 @@
>  #
> 
>  all: test
> 
>  test:
> -	@if command -v $(PYTHON3) >/dev/null 2>&1; then $(PYTHON3) RunTests.py; else python RunTests.py; fi
> +	@if command -v python3 >/dev/null 2>&1; then python3 RunTests.py; else echo "Error: Please install a python 3 tool!"; fi
> 
>  clean:
>  	find . -name '*.pyc' -exec rm '{}' ';'
> 
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel