Re: [PATCH OSSTEST] make-flight: Support specifying a mini-os tree+revision

[Ian Campbell <ian.campbell@citrix.com>]

On Fri, 2015-12-11 at 15:16 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST] make-flight: Support specifying a
> mini-os tree+revision"):
> > This is useful for standalone or adhoc use as well as (presumably)
> > bisection.
> > 
> > There is no ap-* or cr-daily-* integration here because I didn't need
> > it (i.e. I'm not intending to create a new mini-os branch here).
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

This patch fails when building 4.5 and earlier because extras/mini-os
exists but is part of xen.git not a separate repo, so dir_identify_vcs
goes:

    2015-12-15 17:21:50 Z executing ssh ...     osstest@10.80.229.171     cd /home/osstest/build.38523.build-amd64/xen/tools/firmware/ovmf-dir && git rev-parse HEAD^0 
    2015-12-15 17:21:50 Z runvar store: built_vcs_ovmf=git 
    2015-12-15 17:21:50 Z runvar store: built_revision_ovmf=cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd 
    2015-12-15 17:21:50 Z executing ssh ...     osstest@10.80.229.171             set -e
            if ! test -e /home/osstest/build.38523.build-amd64/xen/extras/mini-os; then echo none; exit 0; fi
            cd /home/osstest/build.38523.build-amd64/xen/extras/mini-os
            (test -e .git && echo git) ||
            (test -d .hg && echo hg) ||
            (echo >&2 'unable to determine vcs'; fail)
     
    unable to determine vcs
    bash: line 5: fail: command not found

I'm not sure if this is a bug (i.e. it was intended to be "echo fail") or
if it is deliberately using  a non-existent command (which seems risky to
me).

All the other store_revisions refer to the symlink rather than the -remote
which is the actual clone (when one is made), so I don't think
s#extras/mini-os#extras/mini-os-remote# is the answer. Perhaps "fail"
should become "echo fail" and store_revision should treat that like it does
fail (which is to accept it if $optional).

Ian.


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