Use dirs to hold container paths

Author: ecstatic-morse

src/dirs.rs

@@ -46,3 +46,27 @@ pub(crate) fn crate_source_dir(ex: &Experiment, tc: &Toolchain, krate: &Crate) -
         .join(tc.to_path_component())
         .join(krate.id())
 }
+
+pub mod container {
+    use std::path::{Path, PathBuf};
+
+    use lazy_static::lazy_static;
+
+    #[cfg(windows)]
+    lazy_static! {
+        pub static ref ROOT_DIR: PathBuf = Path::new(r"C:\crater").into();
+    }
+
+    #[cfg(not(windows))]
+    lazy_static! {
+        pub static ref ROOT_DIR: PathBuf = Path::new("/opt/crater").into();
+    }
+
+    lazy_static! {
+        pub static ref WORK_DIR: PathBuf = ROOT_DIR.join("workdir");
+        pub static ref TARGET_DIR: PathBuf = ROOT_DIR.join("target");
+        pub static ref CARGO_HOME: PathBuf = ROOT_DIR.join("cargo-home");
+        pub static ref RUSTUP_HOME: PathBuf = ROOT_DIR.join("rustup-home");
+        pub static ref CARGO_BIN_DIR: PathBuf = CARGO_HOME.join("bin");
+    }
+}

src/run.rs

@@ -1,4 +1,4 @@
-use crate::dirs::{CARGO_HOME, RUSTUP_HOME};
+use crate::dirs::{self, CARGO_HOME, RUSTUP_HOME};
 use crate::docker::DockerEnv;
 use crate::docker::{ContainerBuilder, MountPerms};
 use crate::native;
@@ -238,9 +238,7 @@ impl<'a, 'pl> SandboxedCommand<'a, 'pl> {
         cmd.push(
             match self.command.binary {
                 Binary::Global(path) => path,
-                Binary::InstalledByCrater(path) => {
-                    PathBuf::from("/opt/crater/cargo-home/bin").join(path)
-                }
+                Binary::InstalledByCrater(path) => dirs::container::CARGO_BIN_DIR.join(path),
             }
             .to_string_lossy()
             .as_ref()
@@ -258,9 +256,13 @@ impl<'a, 'pl> SandboxedCommand<'a, 'pl> {
 
         self.container = self
             .container
-            .mount(source_dir, "/opt/crater/workdir", MountPerms::ReadOnly)
-            .env("SOURCE_DIR", "/opt/crater/workdir")
-            .workdir("/opt/crater/workdir")
+            .mount(
+                source_dir,
+                dirs::container::WORK_DIR.to_str().unwrap(),
+                MountPerms::ReadOnly,
+            )
+            .env("SOURCE_DIR", dirs::container::WORK_DIR.to_str().unwrap())
+            .workdir(dirs::container::WORK_DIR.to_str().unwrap())
             .cmd(cmd);
 
         if let Some(user_id) = native::current_user() {
@@ -277,14 +279,21 @@ impl<'a, 'pl> SandboxedCommand<'a, 'pl> {
         if self.command.local_rustup {
             self.container = self
                 .container
-                .mount(&*CARGO_HOME, "/opt/crater/cargo-home", MountPerms::ReadOnly)
+                .mount(
+                    &*CARGO_HOME,
+                    dirs::container::CARGO_HOME.to_str().unwrap(),
+                    MountPerms::ReadOnly,
+                )
                 .mount(
                     &*RUSTUP_HOME,
-                    "/opt/crater/rustup-home",
+                    dirs::container::RUSTUP_HOME.to_str().unwrap(),
                     MountPerms::ReadOnly,
                 )
-                .env("CARGO_HOME", "/opt/crater/cargo-home")
-                .env("RUSTUP_HOME", "/opt/crater/rustup-home");
+                .env("CARGO_HOME", dirs::container::CARGO_HOME.to_str().unwrap())
+                .env(
+                    "RUSTUP_HOME",
+                    dirs::container::RUSTUP_HOME.to_str().unwrap(),
+                );
         }
 
         self.container.run(self.command.quiet)

src/runner/test.rs

@@ -1,3 +1,4 @@
+use crate::dirs;
 use crate::docker::{DockerError, MountPerms};
 use crate::prelude::*;
 use crate::results::{EncodingType, FailureReason, TestResult, WriteResults};
@@ -45,12 +46,19 @@ fn run_cargo<DB: WriteResults>(
         .args(args)
         .quiet(ctx.quiet)
         .cd(source_path)
-        .env("CARGO_TARGET_DIR", "/opt/crater/target")
+        .env(
+            "CARGO_TARGET_DIR",
+            dirs::container::TARGET_DIR.to_str().unwrap(),
+        )
         .env("CARGO_INCREMENTAL", "0")
         .env("RUST_BACKTRACE", "full")
         .env(rustflags_env, rustflags)
         .sandboxed(&ctx.docker_env)
-        .mount(target_dir, "/opt/crater/target", MountPerms::ReadWrite)
+        .mount(
+            target_dir,
+            dirs::container::TARGET_DIR.to_str().unwrap(),
+            MountPerms::ReadWrite,
+        )
         .memory_limit(Some(ctx.config.sandbox.memory_limit))
         .run()?;