Re: [Xen-devel] [PATCH OSSTEST RFC v2 1/2] Add a flight to test qemu.org's ("mainline") master branch.

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

Ian Campbell writes ("[PATCH OSSTEST RFC v2 1/2] Add a flight to test 
qemu.org's ("mainline") master branch."):
> The naming here is slightly confused because we call our branches of qemuu on
> xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct.

IMO the tree in osstest/ should be called "qemu.git".  It's not got a
different git history to the qemu-upstream-foo.  The "mainline"
should be in the ref name.

> +qemu-mainline)
> +        repo_tree_rev_fetch_git $branch \
> +             $BASE_TREE_QEMU_MAINLINE xen-tested-master 
> $LOCALREV_QEMU_MAINLINE

Maybe some / in the branch name ?

> diff --git a/cri-common b/cri-common
> index d82312c..d901383 100644
> --- a/cri-common
> +++ b/cri-common
> @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () {
>  select_xenbranch () {
>       case "$branch" in
>       xen*)                   tree=xen;       xenbranch=$branch ;;
> +     qemu-mainline)          tree=qemuu;     xenbranch=xen-unstable  
> qemuubranch=qemu-mainline;;
>          qemu-upstream-*)    tree=qemuu; 
> xenbranch=xen-${branch#qemu-upstream-};;
>       linux)                  tree=linux;     xenbranch=xen-unstable ;;
>       linux-*)                tree=linux;     xenbranch=xen-unstable ;;
> @@ -55,6 +56,9 @@ select_xenbranch () {
>       else
>               linuxbranch=''
>       fi
> +     if [ x$qemuubranch = x ]; then
> +             qemuubranch="qemu-upstream-${xenbranch#xen-}"
> +     fi

Perhaps it would be easier to move the default setting of qemuubranch
above the case, where it wouldn't need to be conditional.

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel