* [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared @ 2017-09-26 11:45 Daniel Vetter 2017-09-26 11:45 ` [PATCH 2/2] dim: Basic sanity check for nightly.conf Daniel Vetter 2017-09-26 12:01 ` [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared Joonas Lahtinen 0 siblings, 2 replies; 4+ messages in thread From: Daniel Vetter @ 2017-09-26 11:45 UTC (permalink / raw) To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter Suggested by Chris Wilson. v2: Fix typo in the error msg (Chris). Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- dim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dim b/dim index db11d3f1cc68..69109a4f8666 100755 --- a/dim +++ b/dim @@ -220,6 +220,12 @@ if [ "$subcommand" != "setup" ] && [ "$subcommand" != "help" ] && [ "$subcommand exit 1 fi done + for f in $DIM_PREFIX/drm-rerere/nightly.conf; do + if [ ! -f $f ]; then + echoerr "$f is missing, please check your configuration and/or run dim setup" + exit 1 + fi + done fi # -- 2.14.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] dim: Basic sanity check for nightly.conf 2017-09-26 11:45 [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared Daniel Vetter @ 2017-09-26 11:45 ` Daniel Vetter 2017-09-26 11:57 ` Jani Nikula 2017-09-26 12:01 ` [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared Joonas Lahtinen 1 sibling, 1 reply; 4+ messages in thread From: Daniel Vetter @ 2017-09-26 11:45 UTC (permalink / raw) To: Intel Graphics Development; +Cc: Jani Nikula, Daniel Vetter, Daniel Vetter Requested by Jani. To do this properly we need to again push the reading of nightly.conf to be after the basic sanity checks, like it was before commit 12976ee32ae2cb97c7384ef6afde5f9076fc7d99 Author: Jani Nikula <jani.nikula@intel.com> Date: Fri Oct 28 12:40:46 2016 +0300 dim: switch to using remote agnostic integration branch config Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- dim | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dim b/dim index 69109a4f8666..abc5d81f052a 100755 --- a/dim +++ b/dim @@ -115,9 +115,12 @@ function read_integration_config declare -g -A drm_tip_repos declare -g -a drm_tip_config - if [ -r $DIM_PREFIX/drm-rerere/$integration_config ]; then - # shellcheck source=/dev/null - source $DIM_PREFIX/drm-rerere/$integration_config + # shellcheck source=/dev/null + source $DIM_PREFIX/drm-rerere/$integration_config + + if [[ "${#drm_tip_repos[@]}" = "0" ]] || [[ "${#drm_tip_config[@]}" = "0" ]]; then + echoerr "nightly.conf not set up correctly" + exit 1 fi dim_branches= @@ -129,7 +132,6 @@ function read_integration_config fi done } -read_integration_config function echoerr { @@ -228,6 +230,8 @@ if [ "$subcommand" != "setup" ] && [ "$subcommand" != "help" ] && [ "$subcommand done fi +read_integration_config + # # Only function and alias definitions until the subcommand handling at the end. # -- 2.14.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] dim: Basic sanity check for nightly.conf 2017-09-26 11:45 ` [PATCH 2/2] dim: Basic sanity check for nightly.conf Daniel Vetter @ 2017-09-26 11:57 ` Jani Nikula 0 siblings, 0 replies; 4+ messages in thread From: Jani Nikula @ 2017-09-26 11:57 UTC (permalink / raw) To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter On Tue, 26 Sep 2017, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Requested by Jani. No, I didn't mean to request this. I meant, in patch 1, just do the if [[ "${#drm_tip_repos[@]}" = "0" ]] || [[ "${#drm_tip_config[@]}" = "0" ]]; then bit instead. That in itself will ensure the integration config is around and contains sane data. With the change in this patch, the read_integration_config movement doesn't make a difference, you'll blow up on dim setup before you have the drm-rerere repo around. BR, Jani. > > To do this properly we need to again push the reading of nightly.conf > to be after the basic sanity checks, like it was before > > commit 12976ee32ae2cb97c7384ef6afde5f9076fc7d99 > Author: Jani Nikula <jani.nikula@intel.com> > Date: Fri Oct 28 12:40:46 2016 +0300 > > dim: switch to using remote agnostic integration branch config > > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > dim | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/dim b/dim > index 69109a4f8666..abc5d81f052a 100755 > --- a/dim > +++ b/dim > @@ -115,9 +115,12 @@ function read_integration_config > declare -g -A drm_tip_repos > declare -g -a drm_tip_config > > - if [ -r $DIM_PREFIX/drm-rerere/$integration_config ]; then > - # shellcheck source=/dev/null > - source $DIM_PREFIX/drm-rerere/$integration_config > + # shellcheck source=/dev/null > + source $DIM_PREFIX/drm-rerere/$integration_config > + > + if [[ "${#drm_tip_repos[@]}" = "0" ]] || [[ "${#drm_tip_config[@]}" = "0" ]]; then > + echoerr "nightly.conf not set up correctly" > + exit 1 > fi > > dim_branches= > @@ -129,7 +132,6 @@ function read_integration_config > fi > done > } > -read_integration_config > > function echoerr > { > @@ -228,6 +230,8 @@ if [ "$subcommand" != "setup" ] && [ "$subcommand" != "help" ] && [ "$subcommand > done > fi > > +read_integration_config > + > # > # Only function and alias definitions until the subcommand handling at the end. > # -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared 2017-09-26 11:45 [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared Daniel Vetter 2017-09-26 11:45 ` [PATCH 2/2] dim: Basic sanity check for nightly.conf Daniel Vetter @ 2017-09-26 12:01 ` Joonas Lahtinen 1 sibling, 0 replies; 4+ messages in thread From: Joonas Lahtinen @ 2017-09-26 12:01 UTC (permalink / raw) To: Daniel Vetter, Intel Graphics Development; +Cc: Jani Nikula, Daniel Vetter On Tue, 2017-09-26 at 13:45 +0200, Daniel Vetter wrote: > Suggested by Chris Wilson. > > v2: Fix typo in the error msg (Chris). > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Jani suggested that this is bit late already, but I don't see why we couldn't do both checks. Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-26 12:02 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-09-26 11:45 [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared Daniel Vetter 2017-09-26 11:45 ` [PATCH 2/2] dim: Basic sanity check for nightly.conf Daniel Vetter 2017-09-26 11:57 ` Jani Nikula 2017-09-26 12:01 ` [PATCH 1/2] dim: Make sure nightly.conf hasn't disappeared Joonas Lahtinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox