Patchwork testscript.sh: be able to use branches other that testing-next

login
register
mail settings
Submitter Steffen Sledz
Date Feb. 11, 2011, 11:41 a.m.
Message ID <1297424493-25116-1-git-send-email-sledz@dresearch.de>
Download mbox | patch
Permalink /patch/519/
State Accepted
Headers show

Comments

Steffen Sledz - Feb. 11, 2011, 11:41 a.m.
Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---
 contrib/testing/testscript.sh |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
Paul Menzel - Feb. 11, 2011, 12:44 p.m.
Am Freitag, den 11.02.2011, 12:41 +0100 schrieb Steffen Sledz:

There is a typo in the commit summary: `s/that/than/`.

> Signed-off-by: Steffen Sledz <sledz@dresearch.de>
> ---
>  contrib/testing/testscript.sh |   22 ++++++++++++++--------
>  1 files changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/contrib/testing/testscript.sh b/contrib/testing/testscript.sh
> index 7ae2bd5..23c244b 100755
> --- a/contrib/testing/testscript.sh
> +++ b/contrib/testing/testscript.sh
> @@ -1,21 +1,27 @@
>  # this script can be used for testing purposes.
>  # see also http://wiki.openembedded.net/index.php/TestingScript
>  
> -# you can define your machine/distro/recipe below (remove the #) 
> -# or you can pick them up from the environment
> -#MACHINE="beagleboard"
> -#DISTRO="minimal"
> -#TARGET_RECIPE="console-image"
> +# you can set your machine/distro/recipe/branch in the environment
> +# or use these defaults
> +[ -n "${MACHINE}" ] || MACHINE="beagleboard"
> +[ -n "${DISTRO}" ] || DISTRO="minimal"
> +[ -n "${TARGET_RECIPE}" ] || TARGET_RECIPE="console-image"
> +[ -n "${TESTING_BRANCH}" ] || TESTING_BRANCH="testing-next"
>  
>  # test if we have an openembedded dir, clone it if it does not exist
>  if [ ! -d openembedded ]
>  then
>      (git clone git://git.openembedded.org/openembedded)
> -    (cd openembedded; git checkout -b testing-next origin/testing-next)
> +else
> +    # fetch latest objects and refs
> +    (cd openembedded; git fetch)

I always use `git remote update` but it looks like there is no
difference [1][2]. Although I could not find in `git help fetch` what
remote is used by default by `git fetch` if none is provided.

>  fi
>  
> +# create local testing branch if it does not exist yet
> +(cd openembedded; git branch --set-upstream ${TESTING_BRANCH} origin/${TESTING_BRANCH})
> +
>  # switch to the testing branch
> -(cd openembedded; git checkout testing-next)
> +(cd openembedded; git checkout ${TESTING_BRANCH})
>  
>  # test if bitbake exist; if not; fetch it and untar it
>  if [ ! -d bitbake-1.10.2 ]
> @@ -80,7 +86,7 @@ export BBPATH=${TOPDIR}/openembedded
>  rm -rf ${TOPDIR}/tmp
>  
>  # add an echo about the vars so we can see what has been done in a log file
> -echo $MACHINE $DISTRO $TARGET_RECIPE
> +echo ${MACHINE} ${DISTRO} ${TARGET_RECIPE} ${TESTING_BRANCH} `(cd openembedded;git --no-pager log --max-count=1 --pretty=format:%H)`
>  
>  # and do the actual work.
>  bitbake ${TARGET_RECIPE}

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul


[1] http://www.kernel.org/pub/software/scm/git-core/docs/gitworkflows.html 
[2] http://stackoverflow.com/questions/2688251/what-is-the-difference-between-git-fetch-origin-and-git-remote-update-origin

Patch

diff --git a/contrib/testing/testscript.sh b/contrib/testing/testscript.sh
index 7ae2bd5..23c244b 100755
--- a/contrib/testing/testscript.sh
+++ b/contrib/testing/testscript.sh
@@ -1,21 +1,27 @@ 
 # this script can be used for testing purposes.
 # see also http://wiki.openembedded.net/index.php/TestingScript
 
-# you can define your machine/distro/recipe below (remove the #) 
-# or you can pick them up from the environment
-#MACHINE="beagleboard"
-#DISTRO="minimal"
-#TARGET_RECIPE="console-image"
+# you can set your machine/distro/recipe/branch in the environment
+# or use these defaults
+[ -n "${MACHINE}" ] || MACHINE="beagleboard"
+[ -n "${DISTRO}" ] || DISTRO="minimal"
+[ -n "${TARGET_RECIPE}" ] || TARGET_RECIPE="console-image"
+[ -n "${TESTING_BRANCH}" ] || TESTING_BRANCH="testing-next"
 
 # test if we have an openembedded dir, clone it if it does not exist
 if [ ! -d openembedded ]
 then
     (git clone git://git.openembedded.org/openembedded)
-    (cd openembedded; git checkout -b testing-next origin/testing-next)
+else
+    # fetch latest objects and refs
+    (cd openembedded; git fetch)
 fi
 
+# create local testing branch if it does not exist yet
+(cd openembedded; git branch --set-upstream ${TESTING_BRANCH} origin/${TESTING_BRANCH})
+
 # switch to the testing branch
-(cd openembedded; git checkout testing-next)
+(cd openembedded; git checkout ${TESTING_BRANCH})
 
 # test if bitbake exist; if not; fetch it and untar it
 if [ ! -d bitbake-1.10.2 ]
@@ -80,7 +86,7 @@  export BBPATH=${TOPDIR}/openembedded
 rm -rf ${TOPDIR}/tmp
 
 # add an echo about the vars so we can see what has been done in a log file
-echo $MACHINE $DISTRO $TARGET_RECIPE
+echo ${MACHINE} ${DISTRO} ${TARGET_RECIPE} ${TESTING_BRANCH} `(cd openembedded;git --no-pager log --max-count=1 --pretty=format:%H)`
 
 # and do the actual work.
 bitbake ${TARGET_RECIPE}