Feature/test improvements (#934)

* First pass extract the test information by 'running tests'.

* * Checking renderer availablilty
* Using TestInfo to determine which tests are run and synthesized
* Display if test is synthesized and what render api it's targetting

* * Improved comments
* Removed some dead code

* Display ignored tests.

* TestInfo -> TestRequirements

* * Added DIAGNOSTIC_TEST type - test always runs (ie has no requirements).
* Made diagnostic tests use DIAGNOSTIC_TEST
* TestInfo -> TestRequirements
* TestDetails holds TestRequirements and TestOptions

* Fix debug typo.

51 files changed, 57 insertions, 57 deletions

diff --git a/tests/diagnostics/attribute-error.slang b/tests/diagnostics/attribute-error.slang
index b913d3d4a..9cc24437a 100644
--- a/tests/diagnostics/attribute-error.slang
+++ b/tests/diagnostics/attribute-error.slang
@@ -2,7 +2,7 @@
 
 // Tests reflection of user defined attributes.
 
-//TEST:REFLECTION:-stage compute -entry main -target hlsl
+//DIAGNOSTIC_TEST:REFLECTION:-stage compute -entry main -target hlsl
 
 [__AttributeUsage(_AttributeTargets.Struct)]
 struct MyStructAttribute
diff --git a/tests/diagnostics/break-outside-loop.slang b/tests/diagnostics/break-outside-loop.slang
index 0de64e2c5..28db144e8 100644
--- a/tests/diagnostics/break-outside-loop.slang
+++ b/tests/diagnostics/break-outside-loop.slang
@@ -1,5 +1,5 @@
-//TEST:SIMPLE:
-//TEST:COMMAND_LINE_SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
+//DIAGNOSTIC_TEST:COMMAND_LINE_SIMPLE:
 
 // `break` where it isn't allowed
 
diff --git a/tests/diagnostics/call-argument-type.slang b/tests/diagnostics/call-argument-type.slang
index b4f7e7477..93446265d 100644
--- a/tests/diagnostics/call-argument-type.slang
+++ b/tests/diagnostics/call-argument-type.slang
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:
+//DIAGNOSTIC_TEST(smoke):SIMPLE:
 // call function with wrong argument type
 
 struct A {};
diff --git a/tests/diagnostics/command-line/duplicate-output.slang b/tests/diagnostics/command-line/duplicate-output.slang
index 794a8717b..bb6a63070 100644
--- a/tests/diagnostics/command-line/duplicate-output.slang
+++ b/tests/diagnostics/command-line/duplicate-output.slang
@@ -1,3 +1,3 @@
 // duplicate-output.slang
 
-//TEST:SIMPLE:-entry main -stage compute -o myKernel.dxbc -o myKernel.dxbc
+//DIAGNOSTIC_TEST:SIMPLE:-entry main -stage compute -o myKernel.dxbc -o myKernel.dxbc
diff --git a/tests/diagnostics/command-line/duplicate-target.slang b/tests/diagnostics/command-line/duplicate-target.slang
index 44bbc62c7..a9ec96d0f 100644
--- a/tests/diagnostics/command-line/duplicate-target.slang
+++ b/tests/diagnostics/command-line/duplicate-target.slang
@@ -1,3 +1,3 @@
 // duplicate-target.slang
 
-//TEST:SIMPLE:-target hlsl -target hlsl
+//DIAGNOSTIC_TEST:SIMPLE:-target hlsl -target hlsl
diff --git a/tests/diagnostics/command-line/entry-point-conflicting-stage.slang b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang
index 89cf5cba0..c6c517258 100644
--- a/tests/diagnostics/command-line/entry-point-conflicting-stage.slang
+++ b/tests/diagnostics/command-line/entry-point-conflicting-stage.slang
@@ -1,5 +1,5 @@
 // entry-point-conflicting-stage.slang
 
-//TEST:SIMPLE:-stage vertex -stage fragment
+//DIAGNOSTIC_TEST:SIMPLE:-stage vertex -stage fragment
 
-//TEST:SIMPLE:-entry vsMain -stage compute -stage vertex
+//DIAGNOSTIC_TEST:SIMPLE:-entry vsMain -stage compute -stage vertex
diff --git a/tests/diagnostics/command-line/entry-point-redundant-stage.slang b/tests/diagnostics/command-line/entry-point-redundant-stage.slang
index 903d696c7..9507b1ea0 100644
--- a/tests/diagnostics/command-line/entry-point-redundant-stage.slang
+++ b/tests/diagnostics/command-line/entry-point-redundant-stage.slang
@@ -1,5 +1,5 @@
 // entry-point-redundant-stage.slang
 
-//TEST:SIMPLE:-stage vertex -stage vertex
+//DIAGNOSTIC_TEST:SIMPLE:-stage vertex -stage vertex
 
-//TEST:SIMPLE:-entry vsMain -stage vertex -stage vertex
+//DIAGNOSTIC_TEST:SIMPLE:-entry vsMain -stage vertex -stage vertex
diff --git a/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert b/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert
index 0ea731470..ec1f17887 100644
--- a/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert
+++ b/tests/diagnostics/command-line/explicit-implicit-stage-mismatch.vert
@@ -1,3 +1,3 @@
 // explicit-implicit-stage-mismatch.vert
 
-//TEST:SIMPLE:-stage fragment
+//DIAGNOSTIC_TEST:SIMPLE:-stage fragment
diff --git a/tests/diagnostics/command-line/option-missing-argument.slang b/tests/diagnostics/command-line/option-missing-argument.slang
index e62b37ba6..9af53301a 100644
--- a/tests/diagnostics/command-line/option-missing-argument.slang
+++ b/tests/diagnostics/command-line/option-missing-argument.slang
@@ -2,6 +2,6 @@
 
 // Missing argument for an option:
 
-//TEST:SIMPLE:-target -profile ps_4_0
+//DIAGNOSTIC_TEST:SIMPLE:-target -profile ps_4_0
 
-//TEST:SIMPLE:-profile ps_4_0 -target
+//DIAGNOSTIC_TEST:SIMPLE:-profile ps_4_0 -target
diff --git a/tests/diagnostics/command-line/output-no-entry-point.slang b/tests/diagnostics/command-line/output-no-entry-point.slang
index 869dcabc4..891e4387a 100644
--- a/tests/diagnostics/command-line/output-no-entry-point.slang
+++ b/tests/diagnostics/command-line/output-no-entry-point.slang
@@ -1,3 +1,3 @@
 // output-no-entry-point.slang
 
-//TEST:SIMPLE:-o something.dxbc -entry vsMain -stage vertex -entry fsMain -stage fragment
+//DIAGNOSTIC_TEST:SIMPLE:-o something.dxbc -entry vsMain -stage vertex -entry fsMain -stage fragment
diff --git a/tests/diagnostics/command-line/output-no-target.slang b/tests/diagnostics/command-line/output-no-target.slang
index 32921a8f0..a4c38f52d 100644
--- a/tests/diagnostics/command-line/output-no-target.slang
+++ b/tests/diagnostics/command-line/output-no-target.slang
@@ -1,3 +1,3 @@
 // output-no-target.slang
 
-//TEST:SIMPLE:-target dxbc -target spirv -entry main -stage compute -o bad.hlsl
+//DIAGNOSTIC_TEST:SIMPLE:-target dxbc -target spirv -entry main -stage compute -o bad.hlsl
diff --git a/tests/diagnostics/command-line/pass-through-no-stage.hlsl b/tests/diagnostics/command-line/pass-through-no-stage.hlsl
index eabdadf10..e510d811c 100644
--- a/tests/diagnostics/command-line/pass-through-no-stage.hlsl
+++ b/tests/diagnostics/command-line/pass-through-no-stage.hlsl
@@ -5,4 +5,4 @@
 // compilers don't support inferring the stage from
 // an attribute.
 
-//TEST:SIMPLE:-pass-through fxc -entry main
+//DIAGNOSTIC_TEST:SIMPLE:-pass-through fxc -entry main
diff --git a/tests/diagnostics/command-line/profile-ignored.slang b/tests/diagnostics/command-line/profile-ignored.slang
index 8a6590690..8c5a3de11 100644
--- a/tests/diagnostics/command-line/profile-ignored.slang
+++ b/tests/diagnostics/command-line/profile-ignored.slang
@@ -5,10 +5,10 @@
 
 // Case 1: multiple (conflicting) profiles, so we can't infer a single stage
 //
-//TEST:SIMPLE:-profile sm_5_0 -profile glsl_450
+//DIAGNOSTIC_TEST:SIMPLE:-profile sm_5_0 -profile glsl_450
 
 
 // Case 2: a `-profile` option before any `-target`, possibly because
 // the user is specifying things in the wrong order.
 //
-//TEST:SIMPLE:-profile sm_5_0 -target dxbc -profile glsl_450 -target spirv 
+//DIAGNOSTIC_TEST:SIMPLE:-profile sm_5_0 -target dxbc -profile glsl_450 -target spirv 
diff --git a/tests/diagnostics/command-line/stage-ignored.slang b/tests/diagnostics/command-line/stage-ignored.slang
index 6d28c52bc..56a822d6f 100644
--- a/tests/diagnostics/command-line/stage-ignored.slang
+++ b/tests/diagnostics/command-line/stage-ignored.slang
@@ -6,4 +6,4 @@
 // A `-stage` option before any `-entry`, possibly because
 // the user is specifying things in the wrong order.
 //
-//TEST:SIMPLE:-stage vertex -entry vsMain -stage fragment -entry psMain
+//DIAGNOSTIC_TEST:SIMPLE:-stage vertex -entry vsMain -stage fragment -entry psMain
diff --git a/tests/diagnostics/command-line/unknown-codegen-target.slang b/tests/diagnostics/command-line/unknown-codegen-target.slang
index 57015601d..1a5485176 100644
--- a/tests/diagnostics/command-line/unknown-codegen-target.slang
+++ b/tests/diagnostics/command-line/unknown-codegen-target.slang
@@ -1,3 +1,3 @@
 // unknown-codegen-target.slang
 
-//TEST:SIMPLE:-target z80
+//DIAGNOSTIC_TEST:SIMPLE:-target z80
diff --git a/tests/diagnostics/command-line/unknown-line-directive-mode.slang b/tests/diagnostics/command-line/unknown-line-directive-mode.slang
index 7e61df3f9..078adc1ee 100644
--- a/tests/diagnostics/command-line/unknown-line-directive-mode.slang
+++ b/tests/diagnostics/command-line/unknown-line-directive-mode.slang
@@ -1,3 +1,3 @@
 // unknown-line-directive-mode.slang
 
-//TEST:SIMPLE:-line-directive-mode quizzical
+//DIAGNOSTIC_TEST:SIMPLE:-line-directive-mode quizzical
diff --git a/tests/diagnostics/command-line/unknown-option.slang b/tests/diagnostics/command-line/unknown-option.slang
index 52320d758..dd69aa2a5 100644
--- a/tests/diagnostics/command-line/unknown-option.slang
+++ b/tests/diagnostics/command-line/unknown-option.slang
@@ -1,3 +1,3 @@
 // unknown-option.slang
 
-//TEST:SIMPLE:-destroy-all-humans
+//DIAGNOSTIC_TEST:SIMPLE:-destroy-all-humans
diff --git a/tests/diagnostics/command-line/unknown-output-format.slang b/tests/diagnostics/command-line/unknown-output-format.slang
index 05f59022b..63f026130 100644
--- a/tests/diagnostics/command-line/unknown-output-format.slang
+++ b/tests/diagnostics/command-line/unknown-output-format.slang
@@ -1,3 +1,3 @@
 // unknown-output-format.slang
 
-//TEST:SIMPLE:-o cookies.jar
+//DIAGNOSTIC_TEST:SIMPLE:-o cookies.jar
diff --git a/tests/diagnostics/command-line/unknown-pass-through-target.slang b/tests/diagnostics/command-line/unknown-pass-through-target.slang
index 7b86f62d6..1e71e93b0 100644
--- a/tests/diagnostics/command-line/unknown-pass-through-target.slang
+++ b/tests/diagnostics/command-line/unknown-pass-through-target.slang
@@ -1,3 +1,3 @@
 // unknown-pass-through-target.slang
 
-//TEST:SIMPLE:-pass-through subcon
+//DIAGNOSTIC_TEST:SIMPLE:-pass-through subcon
diff --git a/tests/diagnostics/command-line/unknown-profile.slang b/tests/diagnostics/command-line/unknown-profile.slang
index f96363058..9b58bc7af 100644
--- a/tests/diagnostics/command-line/unknown-profile.slang
+++ b/tests/diagnostics/command-line/unknown-profile.slang
@@ -1,3 +1,3 @@
 // unknown-profile.slang
 
-//TEST:SIMPLE:-profile thunder_kiss_65
+//DIAGNOSTIC_TEST:SIMPLE:-profile thunder_kiss_65
diff --git a/tests/diagnostics/command-line/unknown-source-language.slang b/tests/diagnostics/command-line/unknown-source-language.slang
index c39a3ae4f..3ea80c606 100644
--- a/tests/diagnostics/command-line/unknown-source-language.slang
+++ b/tests/diagnostics/command-line/unknown-source-language.slang
@@ -2,4 +2,4 @@
 
 // Unknown source file extension (can't deduce language)
 
-//TEST:SIMPLE:batmobile.car
+//DIAGNOSTIC_TEST:SIMPLE:batmobile.car
diff --git a/tests/diagnostics/command-line/unknown-stage.slang b/tests/diagnostics/command-line/unknown-stage.slang
index 1645e5998..5342936d4 100644
--- a/tests/diagnostics/command-line/unknown-stage.slang
+++ b/tests/diagnostics/command-line/unknown-stage.slang
@@ -1,3 +1,3 @@
 // unknown-stage.slang
 
-//TEST:SIMPLE:-stage green_hills_zone
+//DIAGNOSTIC_TEST:SIMPLE:-stage green_hills_zone
diff --git a/tests/diagnostics/constexpr-error.slang b/tests/diagnostics/constexpr-error.slang
index 6006450a1..f0de9280d 100644
--- a/tests/diagnostics/constexpr-error.slang
+++ b/tests/diagnostics/constexpr-error.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // Failure to pass compile-time-constant data
 // where it is expected.
diff --git a/tests/diagnostics/continue-outside-loop.slang b/tests/diagnostics/continue-outside-loop.slang
index cad9dce6e..ea8f36fea 100644
--- a/tests/diagnostics/continue-outside-loop.slang
+++ b/tests/diagnostics/continue-outside-loop.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // `continue` where it isn't allowed
 
 void foo() { continue; }
diff --git a/tests/diagnostics/entry-point-no-stage.slang b/tests/diagnostics/entry-point-no-stage.slang
index 99ff8193c..042298e0f 100644
--- a/tests/diagnostics/entry-point-no-stage.slang
+++ b/tests/diagnostics/entry-point-no-stage.slang
@@ -4,7 +4,7 @@
 // compiling an entry point without any
 // stage specified.
 
-//TEST:SIMPLE:-entry main
+//DIAGNOSTIC_TEST:SIMPLE:-entry main
 
 void main()
 {}
diff --git a/tests/diagnostics/entry-point-stage-mismatch.slang b/tests/diagnostics/entry-point-stage-mismatch.slang
index 0f143c676..caa8d3e4b 100644
--- a/tests/diagnostics/entry-point-stage-mismatch.slang
+++ b/tests/diagnostics/entry-point-stage-mismatch.slang
@@ -3,7 +3,7 @@
 // Confirm that we diagnose when stage specified via command
 // line doesn't match what was specified via attribute.
 
-//TEST:SIMPLE:-entry main -stage vertex
+//DIAGNOSTIC_TEST:SIMPLE:-entry main -stage vertex
 
 [shader("compute")]
 void main()
diff --git a/tests/diagnostics/enum-implicit-conversion.slang b/tests/diagnostics/enum-implicit-conversion.slang
index d3f3d1d28..fc4757f7e 100644
--- a/tests/diagnostics/enum-implicit-conversion.slang
+++ b/tests/diagnostics/enum-implicit-conversion.slang
@@ -1,6 +1,6 @@
 // enum-implicit-conversion.slang
 
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // Confirm that suitable error messages are
 // generated for code that relies on implicit
diff --git a/tests/diagnostics/expected-token-eof.slang b/tests/diagnostics/expected-token-eof.slang
index 99ab161ec..45d234339 100644
--- a/tests/diagnostics/expected-token-eof.slang
+++ b/tests/diagnostics/expected-token-eof.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // expected one token, but got EOF
 
 int foo()
diff --git a/tests/diagnostics/expected-token.slang b/tests/diagnostics/expected-token.slang
index db85e7b92..8978bc97c 100644
--- a/tests/diagnostics/expected-token.slang
+++ b/tests/diagnostics/expected-token.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // expected one token, but got another
 
 int foo()
diff --git a/tests/diagnostics/gh-38-vs.hlsl b/tests/diagnostics/gh-38-vs.hlsl
index 92e0e957e..bb97482c4 100644
--- a/tests/diagnostics/gh-38-vs.hlsl
+++ b/tests/diagnostics/gh-38-vs.hlsl
@@ -1,4 +1,4 @@
-//TEST:SIMPLE: -profile sm_5_0 -entry main -stage vertex tests/diagnostics/gh-38-fs.hlsl -entry main -stage fragment
+//DIAGNOSTIC_TEST:SIMPLE: -profile sm_5_0 -entry main -stage vertex tests/diagnostics/gh-38-fs.hlsl -entry main -stage fragment
 
 // Ensure that we catch errors with overlapping or conflicting parameter bindings.
 
diff --git a/tests/diagnostics/global-uniform.slang b/tests/diagnostics/global-uniform.slang
index 6d3189cbc..6b17016f2 100644
--- a/tests/diagnostics/global-uniform.slang
+++ b/tests/diagnostics/global-uniform.slang
@@ -1,6 +1,6 @@
 // global-uniform.slang
-//TEST:SIMPLE:-target hlsl
-//TEST:COMMAND_LINE_SIMPLE:-target hlsl
+//DIAGNOSTIC_TEST:SIMPLE:-target hlsl
+//DIAGNOSTIC_TEST:COMMAND_LINE_SIMPLE:-target hlsl
 
 // Any attempt to declare a global variable that actually declares a
 // global uniform should be diagnosed as unsupported.
diff --git a/tests/diagnostics/illegal-character.slang b/tests/diagnostics/illegal-character.slang
index 5915e861f..9831bb93e 100644
--- a/tests/diagnostics/illegal-character.slang
+++ b/tests/diagnostics/illegal-character.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // illegal character
 
 `
diff --git a/tests/diagnostics/implicit-cast-lvalue.slang b/tests/diagnostics/implicit-cast-lvalue.slang
index 4bf3c13b0..79b619443 100644
--- a/tests/diagnostics/implicit-cast-lvalue.slang
+++ b/tests/diagnostics/implicit-cast-lvalue.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // Passing an argument for an `out` parameter such
 // that implicit conversion would be required in
diff --git a/tests/diagnostics/local-used-before-declared.slang b/tests/diagnostics/local-used-before-declared.slang
index 96d68b9eb..bd17666b6 100644
--- a/tests/diagnostics/local-used-before-declared.slang
+++ b/tests/diagnostics/local-used-before-declared.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-target dxbc -profile ps_5_0 -entry main
+//DIAGNOSTIC_TEST:SIMPLE:-target dxbc -profile ps_5_0 -entry main
 
 // Early versions of the front-end had bugs when local
 // variables were used before their definition, or
diff --git a/tests/diagnostics/local-used-in-own-declaration.slang b/tests/diagnostics/local-used-in-own-declaration.slang
index 9802acbb9..d95ef12e0 100644
--- a/tests/diagnostics/local-used-in-own-declaration.slang
+++ b/tests/diagnostics/local-used-in-own-declaration.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-target dxbc -profile ps_5_0
+//DIAGNOSTIC_TEST:SIMPLE:-target dxbc -profile ps_5_0
 
 // Early versions of the front-end had bugs when local
 // variables were used before their definition, or
diff --git a/tests/diagnostics/missing-include-file.slang b/tests/diagnostics/missing-include-file.slang
index 9e0f99b9c..ee49e2cbe 100644
--- a/tests/diagnostics/missing-include-file.slang
+++ b/tests/diagnostics/missing-include-file.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // trying to include a non-existant file
 
 #include "does-not-exist.h"
diff --git a/tests/diagnostics/missing-return.slang b/tests/diagnostics/missing-return.slang
index 83f5f9dc1..988d706d5 100644
--- a/tests/diagnostics/missing-return.slang
+++ b/tests/diagnostics/missing-return.slang
@@ -1,6 +1,6 @@
 // missing-return.slang
 
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // Non-`void` function that fails to return
 
diff --git a/tests/diagnostics/missing-semicolon-after-semantic.slang b/tests/diagnostics/missing-semicolon-after-semantic.slang
index 00fc3aa6c..d2eb12825 100644
--- a/tests/diagnostics/missing-semicolon-after-semantic.slang
+++ b/tests/diagnostics/missing-semicolon-after-semantic.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // Forgetting to put in the `;` after declaraing a variable/field
 // with a semantic used to put the compiler into an infinite loop.
diff --git a/tests/diagnostics/packoffset.slang b/tests/diagnostics/packoffset.slang
index 31ee63bbd..b5669c410 100644
--- a/tests/diagnostics/packoffset.slang
+++ b/tests/diagnostics/packoffset.slang
@@ -1,5 +1,5 @@
 // packoffset.slang
-//TEST:SIMPLE:-target hlsl
+//DIAGNOSTIC_TEST:SIMPLE:-target hlsl
 
 // use of `packoffset` (not supported):
 cbuffer B
diff --git a/tests/diagnostics/parameter-already-defined.slang b/tests/diagnostics/parameter-already-defined.slang
index 860b17e65..312b3d8b0 100644
--- a/tests/diagnostics/parameter-already-defined.slang
+++ b/tests/diagnostics/parameter-already-defined.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // re-use parameter name
 
 int foo( int a, float a ) { return 0; }
diff --git a/tests/diagnostics/recursive-import.slang b/tests/diagnostics/recursive-import.slang
index ff74025f8..b74e55be4 100644
--- a/tests/diagnostics/recursive-import.slang
+++ b/tests/diagnostics/recursive-import.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // A file that recursively imports itself
 // (including transitive cases) should be diagnosed.
diff --git a/tests/diagnostics/register-bindings.slang b/tests/diagnostics/register-bindings.slang
index 188d22bf5..263329bf6 100644
--- a/tests/diagnostics/register-bindings.slang
+++ b/tests/diagnostics/register-bindings.slang
@@ -1,5 +1,5 @@
 // register-bindings.slang
-//TEST:SIMPLE:-target hlsl
+//DIAGNOSTIC_TEST:SIMPLE:-target hlsl
 
 // Various bad forms for register bindings
 
diff --git a/tests/diagnostics/setter-method.slang b/tests/diagnostics/setter-method.slang
index 58e7c3417..c1e6019d0 100644
--- a/tests/diagnostics/setter-method.slang
+++ b/tests/diagnostics/setter-method.slang
@@ -1,6 +1,6 @@
 // setter-method.slang
 
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // Make sure we provide a user a diagnostic if they
 // try to declare a setter method without `mutating`
diff --git a/tests/diagnostics/single-shader-record.slang b/tests/diagnostics/single-shader-record.slang
index 4dbf65daa..0c6657f2f 100644
--- a/tests/diagnostics/single-shader-record.slang
+++ b/tests/diagnostics/single-shader-record.slang
@@ -1,5 +1,5 @@
 // single-shader-record.slang
-//TEST:SIMPLE: -profile sm_6_3 -stage closesthit -entry main -target spirv-assembly
+//DIAGNOSTIC_TEST:SIMPLE: -profile sm_6_3 -stage closesthit -entry main -target spirv-assembly
 
 struct ReflectionRay
 {
diff --git a/tests/diagnostics/static-ref-to-nonstatic-member.slang b/tests/diagnostics/static-ref-to-nonstatic-member.slang
index 485a0ed67..828cf46b1 100644
--- a/tests/diagnostics/static-ref-to-nonstatic-member.slang
+++ b/tests/diagnostics/static-ref-to-nonstatic-member.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 
 struct Color
diff --git a/tests/diagnostics/undefined-identifier.slang b/tests/diagnostics/undefined-identifier.slang
index 6c5a59f75..88633bf07 100644
--- a/tests/diagnostics/undefined-identifier.slang
+++ b/tests/diagnostics/undefined-identifier.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // use of undefined identifier
 
 void foo()
diff --git a/tests/diagnostics/undefined-in-preprocessor-conditional.slang b/tests/diagnostics/undefined-in-preprocessor-conditional.slang
index d46c68d33..100468703 100644
--- a/tests/diagnostics/undefined-in-preprocessor-conditional.slang
+++ b/tests/diagnostics/undefined-in-preprocessor-conditional.slang
@@ -1,4 +1,4 @@
-//TEST(smoke):SIMPLE:
+//DIAGNOSTIC_TEST(smoke):SIMPLE:
 
 // Use an undefined identifier in a preprocessor conditional
 
diff --git a/tests/diagnostics/unreachable-code.slang b/tests/diagnostics/unreachable-code.slang
index 493ccc81f..6c54fcec3 100644
--- a/tests/diagnostics/unreachable-code.slang
+++ b/tests/diagnostics/unreachable-code.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 
 // "Obviously" unreachable code.
 
diff --git a/tests/diagnostics/variable-void-type.slang b/tests/diagnostics/variable-void-type.slang
index 926e6401d..57f16cc22 100644
--- a/tests/diagnostics/variable-void-type.slang
+++ b/tests/diagnostics/variable-void-type.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // variable with `void` type
 
 void foo()
diff --git a/tests/diagnostics/vk-bindings.slang b/tests/diagnostics/vk-bindings.slang
index a329fcdde..c0a3ca7f8 100644
--- a/tests/diagnostics/vk-bindings.slang
+++ b/tests/diagnostics/vk-bindings.slang
@@ -1,6 +1,6 @@
 // vk-bindings.slang
 
-//TEST:SIMPLE:-target spirv
+//DIAGNOSTIC_TEST:SIMPLE:-target spirv
 
 // D3D `register` without VK binding
 Texture2D t : register(t0);
diff --git a/tests/diagnostics/while-predicate-type.slang b/tests/diagnostics/while-predicate-type.slang
index 14ce45533..ec1d55b47 100644
--- a/tests/diagnostics/while-predicate-type.slang
+++ b/tests/diagnostics/while-predicate-type.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:
+//DIAGNOSTIC_TEST:SIMPLE:
 // bad type for `while` predicate
 
 struct S {};