Merge pull request #426 from perftool-incubator/dev-kmr

perftool-incubator · Nov 22, 2024 · d2d480d · d2d480d
2 parents 5a563e9 + 2c2a392
commit d2d480d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/bin/_main b/bin/_main
@@ -412,6 +412,7 @@ elif [ "${1}" == "run" ]; then
       --tools-dir=${CRUCIBLE_HOME}/subprojects/tools\
       --registries-json=${REGISTRIES_CFG}\
       --base-run-dir=$base_run_dir\
+      --external-userenvs-dir=${CRUCIBLE_HOME}/subprojects/userenvs\
       ${passthru_args[@]}"
 
     echo "rickshaw-run command: $rs_run_cmd"

diff --git a/bin/subprojects-install b/bin/subprojects-install
@@ -72,7 +72,7 @@ fi
 
 no_clone=""
 pushd "$crucible_repo_dir" >/dev/null || exit_error "Could not change directory to $crucible_repo_dir"
-/bin/mkdir -p subprojects/benchmarks subprojects/tools subprojects/core subprojects/docs
+/bin/mkdir -p subprojects/benchmarks subprojects/tools subprojects/core subprojects/docs subprojects/userenvs
 for link in $(find subprojects -type l); do
     type_dir=$(echo "${link}" | awk -F'/' '{ print $2 }')
     name_link=$(echo "${link}" | awk -F'/' '{ print $3 }')
@@ -100,6 +100,11 @@ for link in $(find subprojects -type l); do
                     active=1
                 fi
                 ;;
+            "userenvs")
+                if [ "${type_dir}" == "userenvs" ]; then
+                    active=1
+                fi
+                ;;
         esac
     fi
     if [ ${active} == 0 ]; then
@@ -147,6 +152,9 @@ for subproject in "${!subprojects[@]}"; do
         "doc")
             sp_dir_prefix="docs/"
             ;;
+        "userenvs")
+            sp_dir_prefix="userenvs/"
+            ;;
     esac
 
     clone_user_host_org_dir="repos/${sp_git_user}${sp_git_host_org}"