message: Simplify the management of host-config files
diff: @@ -65,14 +65,9 @@ then
  echo "Installing dependencies."
  python tests/uberenv/uberenv.py --spec="${spec}" "${upstream_opt}" "${prefix_opt}"
  - # If only building the dependencies, store the host config file in a
  - # a dedicated directory not to pollute the top directory with it.
  - if [[ "${option}" == "--deps-only" && ! ${ci_context} ]]
  - then
  mkdir -p host-configs
  mv ${project_dir}/hc-*.mk host-configs/
  fi
  -fi
  # Host config file
  if [[ "${option}" != "--deps-only" ]]
  @@ -80,26 +75,26 @@ then
  if [[ -z ${hostconfig} ]]
  then
  # If no host config file was provided, we assume it was generated.
  - # This means we are looking of a unique one in project dir.
  - hostconfigs=( $( ls "${project_dir}/"hc-*.mk || true ) )
  + # This means we are looking of a unique one.
  + hostconfigs=( $( ls "${project_dir}/host-configs/"hc-*.mk || true ) )
  if [[ ${#hostconfigs[@]} == 1 ]]
  then
  hostconfig_path=${hostconfigs[0]}
  echo "Found host config file: ${hostconfig_path}"
  elif [[ ${#hostconfigs[@]} == 0 ]]
  then
  - echo "No result for: ${project_dir}/hc-*.mk"
  + echo "No result for: ${project_dir}/host-configs/hc-*.mk"
  echo "Spack generated host-config not found."
  exit 1
  else
  - echo "More than one result for: ${project_dir}/hc-*.mk"
  + echo "More than one result for: ${project_dir}/host-configs/hc-*.mk"
  echo "${hostconfigs[@]}"
  echo "Please specify one with HOST_CONFIG variable"
  exit 1
  fi
  else
  # Using provided host-config file.
  - hostconfig_path="${project_dir}/host-configs/${hostconfig}"
  + hostconfig_path="${project_dir}/${hostconfig}"
  fi
  fi
  