[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST 3/5] make-*flight: Reorder.
I just got tripped up again by putting a build job filter definition after the call to create_build_jobs. Reorder the make-*flight scripts to reduce the probability of me doing so any more times. The general order of these scripts is now: - job filter callbacks - test job creation - top-level code which drives the process. No change to the output of standalone-generate-dump-flight-runvars. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> --- make-distros-flight | 24 ++++++++++++------------ make-flight | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/make-distros-flight b/make-distros-flight index 90e28c3..9e1d77e 100755 --- a/make-distros-flight +++ b/make-distros-flight @@ -50,18 +50,6 @@ job_create_build_filter_callback () { return 0 } -if [ x$buildflight = x ]; then - - WANT_XEND=false REVISION_LINUX_OLD=disable - - create_build_jobs - -else - - bfi=$buildflight. - -fi - job_create_test_filter_callback () { if [ "$xenarch" = "i386" ]; then return 1; fi return 0 @@ -201,6 +189,18 @@ test_matrix_do_one () { done } +if [ x$buildflight = x ]; then + + WANT_XEND=false REVISION_LINUX_OLD=disable + + create_build_jobs + +else + + bfi=$buildflight. + +fi + test_matrix_iterate echo $flight diff --git a/make-flight b/make-flight index 8523995..5d8284a 100755 --- a/make-flight +++ b/make-flight @@ -58,16 +58,6 @@ job_create_build_filter_callback () { return 0 } -if [ x$buildflight = x ]; then - - create_build_jobs - -else - - bfi=$buildflight. - -fi - job_create_test_filter_callback () { local job=$1; shift local recipe=$1; shift @@ -674,6 +664,16 @@ test_matrix_do_one () { do_pvgrub_tests } +if [ x$buildflight = x ]; then + + create_build_jobs + +else + + bfi=$buildflight. + +fi + test_matrix_iterate echo $flight -- 2.6.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |