diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-04-02 09:22:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 09:22:13 -0400 |
| commit | 2896aa39a529a00673a30ef4a9c3ebe76f401fea (patch) | |
| tree | 3db2c41af598b3285c5313055d90dbf1a5cc06b6 /tests/diagnostics/command-line | |
| parent | c21bffecd9da150576f62ecf8a73a1660717abe9 (diff) | |
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.
Diffstat (limited to 'tests/diagnostics/command-line')
19 files changed, 23 insertions, 23 deletions
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 |