dim: Sanity checks for nightly.conf
PATCH 1/1 dim: Sanity checks for nightly.conf
Suggested by Chris Wilson and Jani Nikula.
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 <[email protected]> Date: Fri Oct 28 12:40:46 2016 +0300
dim: switch to using remote agnostic integration branch config
v2: Don't fail on setup.
v3: Rewrite and squash.
v4: Typing code with jetlag, hard it is.
Cc Jani Nikula <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Acked-by Jani Nikula <[email protected]>
Signed-off-by Daniel Vetter <[email protected]>
--- dim | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
dim +10 -1
@@ -118,6 +118,14 @@ function read_integration_config if [ -r $DIM_PREFIX/drm-rerere/$integration_config ]; then # shellcheck source=/dev/null source $DIM_PREFIX/drm-rerere/$integration_config + + if [[ "${#drm_tip_repos[@]}" = "0" ]] || [[ "${#drm_tip_config[@]}" = "0" ]]; then + echoerr "$integration_config not set up correctly, please fix manually" + exit 1 + fi + else + echoerr "$integration_config is missing, please check your configuration and/or run dim setup" + exit 1 fi dim_branches=
@@ -129,7 +137,6 @@ function read_integration_config fi done } -read_integration_config function echoerr {
@@ -220,6 +227,8 @@ if [ "$subcommand" != "setup" ] && [ "$subcommand" != "help" ] && [ "$subcommand exit 1 fi done + + read_integration_config fi #
Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx