Make stage_id use the env

Without this the skip directives weren't working. This looks to
largely be legacy anyway, but tests now run and pass in the
correct environments.

Author: LegNeato

tests/src/main.rs

@@ -145,7 +145,13 @@ impl Runner {
             // in different testing variations (i.e. experimental features), while
             // keeping *most* of the tests unchanged, we make use of "stage IDs",
             // which offer `// only-S` and `// ignore-S` for any stage ID `S`.
-            let stage_id = variation.name;
+            let stage_id = if variation.name == "default" {
+                // Use the environment name as the stage ID.
+                env.to_string()
+            } else {
+                // Include the variation name in the stage ID.
+                format!("{}-{}", env, variation.name)
+            };
 
             let target = format!("{SPIRV_TARGET_PREFIX}{env}");
             let libs = build_deps(&self.deps_target_dir, &self.codegen_backend_path, &target);
@@ -164,7 +170,7 @@ impl Runner {
             flags += variation.extra_flags;
 
             let config = compiletest::Config {
-                stage_id: stage_id.to_string(),
+                stage_id,
                 target_rustcflags: Some(flags),
                 mode: mode.parse().expect("Invalid mode"),
                 target: target_spec_json(&target),

tests/ui/lang/core/ref/member_ref_arg-broken.rs

@@ -3,7 +3,7 @@
 // we care more that the error messages do not regress too much.
 
 // build-fail
-
+// normalize-stderr-test     "ref/member_ref_arg-broken\.[^`]*" -> "ref/member_ref_arg-broken"
 // normalize-stderr-test     "38\[%38\]" -> "$$ID[%$$ID]"
 
 use spirv_std::spirv;

tests/ui/lang/core/ref/member_ref_arg-broken.stderr

@@ -6,7 +6,7 @@ error: error:0:0 - OpLoad Pointer <id> '$ID[%$ID]' is not a logical pointer.
          %39 = OpLoad %uint %38
   |
   = note: spirv-val failed
-  = note: module `$TEST_BUILD_DIR/lang/core/ref/member_ref_arg-broken.default`
+  = note: module `$TEST_BUILD_DIR/lang/core/ref/member_ref_arg-broken`
 
 error: aborting due to 1 previous error; 2 warnings emitted