[nextest-runner] set NEXTEST_TEST_GROUP

Expose the group name that the test is running under, if any.

Author: sunshowers

fixtures/nextest-tests/tests/basic.rs

@@ -383,13 +383,17 @@ fn test_stdin_closed() {
 /// This should be called if and only if the test-group is serial.
 fn assert_with_retries_serial() {
     let profile = std::env::var("NEXTEST_PROFILE").expect("NEXTEST_PROFILE should be set");
+    let group = std::env::var("NEXTEST_TEST_GROUP").expect("NEXTEST_TEST_GROUP should be set");
     let group_slot =
         std::env::var("NEXTEST_TEST_GROUP_SLOT").expect("NEXTEST_TEST_GROUP_SLOT should be set");
+    println!("NEXTEST_TEST_GROUP = {group}, NEXTEST_TEST_GROUP_SLOT = {group_slot}");
+
     if profile == "with-retries" {
-        // Check that NEXTEST_TEST_GROUP_SLOT is set.
+        assert_eq!(group, "serial", "NEXTEST_TEST_GROUP should be serial");
         // This test is in a serial group, so the group slot should be 0.
         assert_eq!(group_slot, "0", "NEXTEST_TEST_GROUP_SLOT should be 0");
     } else {
+        assert_eq!(group, "@global", "NEXTEST_TEST_GROUP should be @global");
         assert_eq!(group_slot, "none", "NEXTEST_TEST_GROUP_SLOT should be none");
     }
 }

nextest-runner/src/runner/executor.rs

@@ -15,7 +15,7 @@ use super::HandleSignalResult;
 use crate::{
     config::{
         EvaluatableProfile, RetryPolicy, ScriptConfig, ScriptId, SetupScriptCommand,
-        SetupScriptExecuteData, SlowTimeout, TestSettings,
+        SetupScriptExecuteData, SlowTimeout, TestGroup, TestSettings,
     },
     double_spawn::DoubleSpawnInfo,
     errors::{ChildError, ChildFdError, ChildStartError, ErrorList},
@@ -628,15 +628,34 @@ impl<'a> ExecutorContext<'a> {
         command_mut.env("__NEXTEST_ATTEMPT", format!("{}", test.retry_data.attempt));
 
         command_mut.env("NEXTEST_RUN_ID", format!("{}", self.run_id));
+
+        // Set group and slot environment variables.
         command_mut.env(
             "NEXTEST_TEST_GLOBAL_SLOT",
             test.cx.global_slot().to_string(),
         );
+        match test.settings.test_group() {
+            TestGroup::Custom(name) => {
+                debug_assert!(
+                    test.cx.group_slot().is_some(),
+                    "test_group being set implies group_slot is set"
+                );
+                command_mut.env("NEXTEST_TEST_GROUP", name.as_str());
+            }
+            TestGroup::Global => {
+                debug_assert!(
+                    test.cx.group_slot().is_none(),
+                    "test_group being unset implies group_slot is unset"
+                );
+                command_mut.env("NEXTEST_TEST_GROUP", TestGroup::GLOBAL_STR);
+            }
+        }
         if let Some(group_slot) = test.cx.group_slot() {
             command_mut.env("NEXTEST_TEST_GROUP_SLOT", group_slot.to_string());
         } else {
             command_mut.env("NEXTEST_TEST_GROUP_SLOT", "none");
         }
+
         command_mut.stdin(Stdio::null());
         test.setup_script_data.apply(
             &test.test_instance.to_test_query(),