Move some code around

This is a step towards fixing a bug in reporting that the scheduler is currently in the setup phase.
elabit · Nov 14, 2023 · 446f6f4 · 446f6f4
1 parent 802f812
commit 446f6f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/v2/robotmk/src/bin/scheduler/main.rs b/v2/robotmk/src/bin/scheduler/main.rs
@@ -47,8 +47,10 @@ fn run() -> Result<()> {
     }
 
     write_state(&results::SchedulerState::Setup, &global_config)?;
-    let suites = setup::setup(&global_config, suites)?;
-    debug!("Setup completed");
+    setup::general::setup(&global_config, &suites).context("General setup failed")?;
+    debug!("General setup completed");
+    let suites = setup::rcc::setup(&global_config, suites).context("RCC-specific setup failed")?;
+    debug!("RCC-specific setup completed");
 
     if global_config.termination_flag.should_terminate() {
         bail!("Terminated")

diff --git a/v2/robotmk/src/bin/scheduler/setup.rs b/v2/robotmk/src/bin/scheduler/setup.rs
@@ -0,0 +1,3 @@
+pub mod general;
+mod icacls;
+pub mod rcc;
diff --git a/v2/robotmk/src/bin/scheduler/setup/mod.rs b/v2/robotmk/src/bin/scheduler/setup/mod.rs