live-test -> live-tests

.github/buildomat/jobs/build-live-test.sh → .github/buildomat/jobs/build-live-tests.sh

@@ -23,5 +23,5 @@ source ./env.sh
 banner prerequisites
 ptime -m bash ./tools/install_builder_prerequisites.sh -y
 
-banner live-test
-ptime -m cargo xtask live-test
+banner live-tests
+ptime -m cargo xtask live-tests

dev-tools/xtask/src/live_test.rs → dev-tools/xtask/src/live_tests.rs

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//! Subcommand: cargo xtask live-test
+//! Subcommand: cargo xtask live-tests
 
 use crate::common::run_subcmd;
 use anyhow::{bail, Context, Result};
@@ -13,7 +13,7 @@ use std::process::Command;
 pub struct Args {}
 
 pub fn run_cmd(_args: Args) -> Result<()> {
-    const NAME: &str = "live-test-archive";
+    const NAME: &str = "live-tests-archive";
 
     // The live tests operate in deployed environments, which always run
     // illumos.  Bail out quickly if someone tries to run this on a system whose
@@ -22,7 +22,7 @@ pub fn run_cmd(_args: Args) -> Result<()> {
     // silently missing something you might expect to be there.  Plus, you can
     // still check and even build *this* code on non-illumos systems.)
     if cfg!(not(target_os = "illumos")) {
-        bail!("live-test archive can only be built on illumos systems");
+        bail!("live-tests archive can only be built on illumos systems");
     }
 
     let tmpdir_root =
@@ -71,8 +71,8 @@ pub fn run_cmd(_args: Args) -> Result<()> {
     // plus the nextext archive file.
     //
     // To avoid creating a tarbomb, we want all the files prefixed with
-    // "live-test-archive/".  There's no great way to do this with the illumos
-    // tar(1) except to create a temporary directory called "live-test-archive"
+    // "live-tests-archive/".  There's no great way to do this with the illumos
+    // tar(1) except to create a temporary directory called "live-tests-archive"
     // that contains the files and then tar'ing up that.
     //
     // Ironically, an easy way to construct that directory is with tar(1).

dev-tools/xtask/src/main.rs

@@ -19,7 +19,7 @@ mod clippy;
 mod common;
 #[cfg_attr(not(target_os = "illumos"), allow(dead_code))]
 mod external;
-mod live_test;
+mod live_tests;
 mod usdt;
 
 #[cfg(target_os = "illumos")]
@@ -62,7 +62,7 @@ enum Cmds {
     Download(external::External),
 
     /// Create a bundle of live tests
-    LiveTest(live_test::Args),
+    LiveTests(live_tests::Args),
 
     /// Utilities for working with MGS.
     MgsDev(external::External),
@@ -132,7 +132,7 @@ fn main() -> Result<()> {
                 external.exec_bin("xtask-downloader")
             }
         }
-        Cmds::LiveTest(args) => live_test::run_cmd(args),
+        Cmds::LiveTests(args) => live_tests::run_cmd(args),
         Cmds::MgsDev(external) => external.exec_bin("mgs-dev"),
         Cmds::OmicronDev(external) => external.exec_bin("omicron-dev"),
         Cmds::Openapi(external) => external.exec_bin("openapi-manager"),