diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-06-12 14:33:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 14:33:31 -0700 |
| commit | ce90fec1c795eaafbd91d7b8a83501a57eeb1946 (patch) | |
| tree | 2e939a9ef7b972944b71ea3f7d11a17af844c3fe | |
| parent | d1f11a29f8a48eecd47ac64c8635ed062cba982d (diff) | |
| parent | 5b49974bd6ddd248b5ee1b1e29c0acfc3c422a3a (diff) | |
Merge pull request #3 from tfoleyNV/rename-tests
Rename tests from `*.spire` to `*.slang`
| -rw-r--r-- | tests/diagnostics/break-outside-loop.slang (renamed from tests/diagnostics/break-outside-loop.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/break-outside-loop.slang.expected (renamed from tests/diagnostics/break-outside-loop.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/call-argument-type.slang (renamed from tests/diagnostics/call-argument-type.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/call-argument-type.slang.expected (renamed from tests/diagnostics/call-argument-type.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/continue-outside-loop.slang (renamed from tests/diagnostics/continue-outside-loop.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/continue-outside-loop.slang.expected (renamed from tests/diagnostics/continue-outside-loop.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/expected-token-eof.slang (renamed from tests/diagnostics/expected-token-eof.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/expected-token-eof.slang.expected (renamed from tests/diagnostics/expected-token-eof.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/expected-token.slang (renamed from tests/diagnostics/expected-token.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/expected-token.slang.expected (renamed from tests/diagnostics/expected-token.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/function-redefinition.slang.disabled (renamed from tests/diagnostics/function-redefinition.spire.disabled) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/function-redefinition.slang.expected (renamed from tests/diagnostics/function-redefinition.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/hull-shader-invalid-domain.slang.disabled (renamed from tests/diagnostics/hull-shader-invalid-domain.spire.disabled) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/hull-shader-invalid-domain.slang.expected (renamed from tests/diagnostics/hull-shader-invalid-domain.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/hull-shader-no-domain.slang.disabled (renamed from tests/diagnostics/hull-shader-no-domain.spire.disabled) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/hull-shader-no-domain.slang.expected (renamed from tests/diagnostics/hull-shader-no-domain.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/illegal-character.slang (renamed from tests/diagnostics/illegal-character.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/illegal-character.slang.expected (renamed from tests/diagnostics/illegal-character.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/missing-file.slang.disabled (renamed from tests/diagnostics/missing-file.spire.disabled) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/missing-file.slang.expected | 7 | ||||
| -rw-r--r-- | tests/diagnostics/missing-file.spire.expected | 7 | ||||
| -rw-r--r-- | tests/diagnostics/missing-include-file.slang (renamed from tests/diagnostics/missing-include-file.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/missing-include-file.slang.expected (renamed from tests/diagnostics/missing-include-file.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/parameter-already-defined.slang (renamed from tests/diagnostics/parameter-already-defined.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/parameter-already-defined.slang.expected (renamed from tests/diagnostics/parameter-already-defined.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/undefined-identifier.slang (renamed from tests/diagnostics/undefined-identifier.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/undefined-identifier.slang.expected (renamed from tests/diagnostics/undefined-identifier.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/variable-void-type.slang (renamed from tests/diagnostics/variable-void-type.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/variable-void-type.slang.expected (renamed from tests/diagnostics/variable-void-type.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/diagnostics/while-predicate-type.slang (renamed from tests/diagnostics/while-predicate-type.spire) | 0 | ||||
| -rw-r--r-- | tests/diagnostics/while-predicate-type.slang.expected (renamed from tests/diagnostics/while-predicate-type.spire.expected) | 2 | ||||
| -rw-r--r-- | tests/front-end/lexer-comments.slang (renamed from tests/front-end/lexer-comments.spire) | 0 | ||||
| -rw-r--r-- | tests/front-end/parser-decls.slang (renamed from tests/front-end/parser-decls.spire) | 0 | ||||
| -rw-r--r-- | tests/front-end/parser-empty.slang (renamed from tests/front-end/parser-empty.spire) | 0 | ||||
| -rw-r--r-- | tests/front-end/parser-error-unclosed-curly.slang (renamed from tests/front-end/parser-error-unclosed-curly.spire) | 0 | ||||
| -rw-r--r-- | tests/front-end/parser-error-unclosed-curly.slang.expected | 6 | ||||
| -rw-r--r-- | tests/front-end/parser-error-unclosed-curly.spire.expected | 6 | ||||
| -rw-r--r-- | tests/front-end/parser-using-file-a.slang.h (renamed from tests/front-end/parser-using-file-a.spireh) | 0 | ||||
| -rw-r--r-- | tests/front-end/parser-using-file.spire.disabled | 2 | ||||
| -rw-r--r-- | tests/front-end/pipeline-simple.slang.h (renamed from tests/front-end/pipeline-simple.spireh) | 2 | ||||
| -rw-r--r-- | tests/front-end/struct.slang (renamed from tests/front-end/struct.spire) | 2 | ||||
| -rw-r--r-- | tests/front-end/typedef.slang (renamed from tests/front-end/typedef.spire) | 0 | ||||
| -rw-r--r-- | tests/preprocessor/define-function-like.slang (renamed from tests/preprocessor/define-function-like.spire) | 0 | ||||
| -rw-r--r-- | tests/preprocessor/define-function-like.slang.expected | 7 | ||||
| -rw-r--r-- | tests/preprocessor/define-function-like.spire.expected | 7 | ||||
| -rw-r--r-- | tests/preprocessor/define-simple.slang (renamed from tests/preprocessor/define-simple.spire) | 0 | ||||
| -rw-r--r-- | tests/preprocessor/if.slang (renamed from tests/preprocessor/if.spire) | 0 | ||||
| -rw-r--r-- | tests/preprocessor/ifdef.slang (renamed from tests/preprocessor/ifdef.spire) | 0 | ||||
| -rw-r--r-- | tests/preprocessor/include-a.slang.h (renamed from tests/preprocessor/include-a.spireh) | 0 | ||||
| -rw-r--r-- | tests/preprocessor/include.slang (renamed from tests/preprocessor/include.spire) | 2 |
50 files changed, 39 insertions, 39 deletions
diff --git a/tests/diagnostics/break-outside-loop.spire b/tests/diagnostics/break-outside-loop.slang index f86b0bad6..f86b0bad6 100644 --- a/tests/diagnostics/break-outside-loop.spire +++ b/tests/diagnostics/break-outside-loop.slang diff --git a/tests/diagnostics/break-outside-loop.spire.expected b/tests/diagnostics/break-outside-loop.slang.expected index 2d56efaa9..80d79537b 100644 --- a/tests/diagnostics/break-outside-loop.spire.expected +++ b/tests/diagnostics/break-outside-loop.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/break-outside-loop.spire(4): error 30003: 'break' must appear inside loop constructs. +tests/diagnostics/break-outside-loop.slang(4): error 30003: 'break' must appear inside loop constructs. } standard output = { } diff --git a/tests/diagnostics/call-argument-type.spire b/tests/diagnostics/call-argument-type.slang index d9663147f..d9663147f 100644 --- a/tests/diagnostics/call-argument-type.spire +++ b/tests/diagnostics/call-argument-type.slang diff --git a/tests/diagnostics/call-argument-type.spire.expected b/tests/diagnostics/call-argument-type.slang.expected index 09a01a359..0854dbbe3 100644 --- a/tests/diagnostics/call-argument-type.spire.expected +++ b/tests/diagnostics/call-argument-type.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/call-argument-type.spire(10): error 30019: expected an expression of type 'A', got 'B' +tests/diagnostics/call-argument-type.slang(10): error 30019: expected an expression of type 'A', got 'B' } standard output = { } diff --git a/tests/diagnostics/continue-outside-loop.spire b/tests/diagnostics/continue-outside-loop.slang index cad9dce6e..cad9dce6e 100644 --- a/tests/diagnostics/continue-outside-loop.spire +++ b/tests/diagnostics/continue-outside-loop.slang diff --git a/tests/diagnostics/continue-outside-loop.spire.expected b/tests/diagnostics/continue-outside-loop.slang.expected index d12cceb78..2298a0ec5 100644 --- a/tests/diagnostics/continue-outside-loop.spire.expected +++ b/tests/diagnostics/continue-outside-loop.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/continue-outside-loop.spire(4): error 30004: 'continue' must appear inside loop constructs. +tests/diagnostics/continue-outside-loop.slang(4): error 30004: 'continue' must appear inside loop constructs. } standard output = { } diff --git a/tests/diagnostics/expected-token-eof.spire b/tests/diagnostics/expected-token-eof.slang index 99ab161ec..99ab161ec 100644 --- a/tests/diagnostics/expected-token-eof.spire +++ b/tests/diagnostics/expected-token-eof.slang diff --git a/tests/diagnostics/expected-token-eof.spire.expected b/tests/diagnostics/expected-token-eof.slang.expected index 121ac3374..a1446cb14 100644 --- a/tests/diagnostics/expected-token-eof.spire.expected +++ b/tests/diagnostics/expected-token-eof.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/expected-token-eof.spire(6): error 20001: unexpected end of file, expected ';' +tests/diagnostics/expected-token-eof.slang(6): error 20001: unexpected end of file, expected ';' } standard output = { } diff --git a/tests/diagnostics/expected-token.spire b/tests/diagnostics/expected-token.slang index db85e7b92..db85e7b92 100644 --- a/tests/diagnostics/expected-token.spire +++ b/tests/diagnostics/expected-token.slang diff --git a/tests/diagnostics/expected-token.spire.expected b/tests/diagnostics/expected-token.slang.expected index 508a06726..9c5c886ba 100644 --- a/tests/diagnostics/expected-token.spire.expected +++ b/tests/diagnostics/expected-token.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/expected-token.spire(6): error 20001: unexpected ']', expected ';' +tests/diagnostics/expected-token.slang(6): error 20001: unexpected ']', expected ';' } standard output = { } diff --git a/tests/diagnostics/function-redefinition.spire.disabled b/tests/diagnostics/function-redefinition.slang.disabled index d47cb1bbc..d47cb1bbc 100644 --- a/tests/diagnostics/function-redefinition.spire.disabled +++ b/tests/diagnostics/function-redefinition.slang.disabled diff --git a/tests/diagnostics/function-redefinition.spire.expected b/tests/diagnostics/function-redefinition.slang.expected index 94b0d3626..ff96cf5ea 100644 --- a/tests/diagnostics/function-redefinition.spire.expected +++ b/tests/diagnostics/function-redefinition.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/function-redefinition.spire(5): error 30001: 'foo(int)': function redefinition. +tests/diagnostics/function-redefinition.slang(5): error 30001: 'foo(int)': function redefinition. } standard output = { } diff --git a/tests/diagnostics/hull-shader-invalid-domain.spire.disabled b/tests/diagnostics/hull-shader-invalid-domain.slang.disabled index a1341631a..a1341631a 100644 --- a/tests/diagnostics/hull-shader-invalid-domain.spire.disabled +++ b/tests/diagnostics/hull-shader-invalid-domain.slang.disabled diff --git a/tests/diagnostics/hull-shader-invalid-domain.spire.expected b/tests/diagnostics/hull-shader-invalid-domain.slang.expected index 89b4634aa..6b8d7761c 100644 --- a/tests/diagnostics/hull-shader-invalid-domain.spire.expected +++ b/tests/diagnostics/hull-shader-invalid-domain.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/hull-shader-invalid-domain.spire(39): error 50053: 'Domain' should be either 'triangles' or 'quads'. +tests/diagnostics/hull-shader-invalid-domain.slang(39): error 50053: 'Domain' should be either 'triangles' or 'quads'. } standard output = { } diff --git a/tests/diagnostics/hull-shader-no-domain.spire.disabled b/tests/diagnostics/hull-shader-no-domain.slang.disabled index 87bf2a81c..87bf2a81c 100644 --- a/tests/diagnostics/hull-shader-no-domain.spire.disabled +++ b/tests/diagnostics/hull-shader-no-domain.slang.disabled diff --git a/tests/diagnostics/hull-shader-no-domain.spire.expected b/tests/diagnostics/hull-shader-no-domain.slang.expected index 08a08ad79..98543caaf 100644 --- a/tests/diagnostics/hull-shader-no-domain.spire.expected +++ b/tests/diagnostics/hull-shader-no-domain.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/hull-shader-no-domain.spire(32): error 50052: 'HullShader' requires attribute 'Domain'. +tests/diagnostics/hull-shader-no-domain.slang(32): error 50052: 'HullShader' requires attribute 'Domain'. } standard output = { } diff --git a/tests/diagnostics/illegal-character.spire b/tests/diagnostics/illegal-character.slang index 5915e861f..5915e861f 100644 --- a/tests/diagnostics/illegal-character.spire +++ b/tests/diagnostics/illegal-character.slang diff --git a/tests/diagnostics/illegal-character.spire.expected b/tests/diagnostics/illegal-character.slang.expected index 301b99063..4c5ac7086 100644 --- a/tests/diagnostics/illegal-character.spire.expected +++ b/tests/diagnostics/illegal-character.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/illegal-character.spire(4): error 10000: illegal character '`' +tests/diagnostics/illegal-character.slang(4): error 10000: illegal character '`' } standard output = { } diff --git a/tests/diagnostics/missing-file.spire.disabled b/tests/diagnostics/missing-file.slang.disabled index f340dd95e..a1128d97b 100644 --- a/tests/diagnostics/missing-file.spire.disabled +++ b/tests/diagnostics/missing-file.slang.disabled @@ -1,3 +1,3 @@ // trying to import a non-existant file -using "does-not-exist.spire" +using "does-not-exist.slang" diff --git a/tests/diagnostics/missing-file.slang.expected b/tests/diagnostics/missing-file.slang.expected new file mode 100644 index 000000000..13a066d4c --- /dev/null +++ b/tests/diagnostics/missing-file.slang.expected @@ -0,0 +1,7 @@ +result code = -1 +standard error = { +tests/diagnostics/missing-file.slang(1): error 20001: unexpected end of file, expected ';' +tests/diagnostics/missing-file.slang(4): error 2: cannot find file 'does-not-exist.slang'. +} +standard output = { +} diff --git a/tests/diagnostics/missing-file.spire.expected b/tests/diagnostics/missing-file.spire.expected deleted file mode 100644 index d4722c0e2..000000000 --- a/tests/diagnostics/missing-file.spire.expected +++ /dev/null @@ -1,7 +0,0 @@ -result code = -1 -standard error = { -Tests/Diagnostics/missing-file.spire(1): error 20001: unexpected end of file, expected ';' -Tests/Diagnostics/missing-file.spire(4): error 2: cannot find file 'does-not-exist.spire'. -} -standard output = { -} diff --git a/tests/diagnostics/missing-include-file.spire b/tests/diagnostics/missing-include-file.slang index 9e0f99b9c..9e0f99b9c 100644 --- a/tests/diagnostics/missing-include-file.spire +++ b/tests/diagnostics/missing-include-file.slang diff --git a/tests/diagnostics/missing-include-file.spire.expected b/tests/diagnostics/missing-include-file.slang.expected index 24649c484..7f13d3616 100644 --- a/tests/diagnostics/missing-include-file.spire.expected +++ b/tests/diagnostics/missing-include-file.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/missing-include-file.spire(4): error 15300: failed to find include file 'does-not-exist.h' +tests/diagnostics/missing-include-file.slang(4): error 15300: failed to find include file 'does-not-exist.h' } standard output = { } diff --git a/tests/diagnostics/parameter-already-defined.spire b/tests/diagnostics/parameter-already-defined.slang index 860b17e65..860b17e65 100644 --- a/tests/diagnostics/parameter-already-defined.spire +++ b/tests/diagnostics/parameter-already-defined.slang diff --git a/tests/diagnostics/parameter-already-defined.spire.expected b/tests/diagnostics/parameter-already-defined.slang.expected index 0021afa42..ae7546a10 100644 --- a/tests/diagnostics/parameter-already-defined.spire.expected +++ b/tests/diagnostics/parameter-already-defined.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/parameter-already-defined.spire(4): error 30002: parameter 'a' already defined. +tests/diagnostics/parameter-already-defined.slang(4): error 30002: parameter 'a' already defined. } standard output = { } diff --git a/tests/diagnostics/undefined-identifier.spire b/tests/diagnostics/undefined-identifier.slang index 6c5a59f75..6c5a59f75 100644 --- a/tests/diagnostics/undefined-identifier.spire +++ b/tests/diagnostics/undefined-identifier.slang diff --git a/tests/diagnostics/undefined-identifier.spire.expected b/tests/diagnostics/undefined-identifier.slang.expected index 2eed77baf..48361e78c 100644 --- a/tests/diagnostics/undefined-identifier.spire.expected +++ b/tests/diagnostics/undefined-identifier.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/undefined-identifier.spire(6): error 30015: undefined identifier 'b'. +tests/diagnostics/undefined-identifier.slang(6): error 30015: undefined identifier 'b'. } standard output = { } diff --git a/tests/diagnostics/variable-void-type.spire b/tests/diagnostics/variable-void-type.slang index 926e6401d..926e6401d 100644 --- a/tests/diagnostics/variable-void-type.spire +++ b/tests/diagnostics/variable-void-type.slang diff --git a/tests/diagnostics/variable-void-type.spire.expected b/tests/diagnostics/variable-void-type.slang.expected index 1f0e6765c..a243dd50a 100644 --- a/tests/diagnostics/variable-void-type.spire.expected +++ b/tests/diagnostics/variable-void-type.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/variable-void-type.spire(6): error 30009: invalid type 'void'. +tests/diagnostics/variable-void-type.slang(6): error 30009: invalid type 'void'. } standard output = { } diff --git a/tests/diagnostics/while-predicate-type.spire b/tests/diagnostics/while-predicate-type.slang index 14ce45533..14ce45533 100644 --- a/tests/diagnostics/while-predicate-type.spire +++ b/tests/diagnostics/while-predicate-type.slang diff --git a/tests/diagnostics/while-predicate-type.spire.expected b/tests/diagnostics/while-predicate-type.slang.expected index 9f94e679e..d921c588e 100644 --- a/tests/diagnostics/while-predicate-type.spire.expected +++ b/tests/diagnostics/while-predicate-type.slang.expected @@ -1,6 +1,6 @@ result code = -1 standard error = { -Tests/Diagnostics/while-predicate-type.spire(9): error 30010: 'while': expression must evaluate to int. +tests/diagnostics/while-predicate-type.slang(9): error 30010: 'while': expression must evaluate to int. } standard output = { } diff --git a/tests/front-end/lexer-comments.spire b/tests/front-end/lexer-comments.slang index d8c06ca76..d8c06ca76 100644 --- a/tests/front-end/lexer-comments.spire +++ b/tests/front-end/lexer-comments.slang diff --git a/tests/front-end/parser-decls.spire b/tests/front-end/parser-decls.slang index bc5a2b13b..bc5a2b13b 100644 --- a/tests/front-end/parser-decls.spire +++ b/tests/front-end/parser-decls.slang diff --git a/tests/front-end/parser-empty.spire b/tests/front-end/parser-empty.slang index bfd66f05b..bfd66f05b 100644 --- a/tests/front-end/parser-empty.spire +++ b/tests/front-end/parser-empty.slang diff --git a/tests/front-end/parser-error-unclosed-curly.spire b/tests/front-end/parser-error-unclosed-curly.slang index 6cfcca456..6cfcca456 100644 --- a/tests/front-end/parser-error-unclosed-curly.spire +++ b/tests/front-end/parser-error-unclosed-curly.slang diff --git a/tests/front-end/parser-error-unclosed-curly.slang.expected b/tests/front-end/parser-error-unclosed-curly.slang.expected new file mode 100644 index 000000000..379557108 --- /dev/null +++ b/tests/front-end/parser-error-unclosed-curly.slang.expected @@ -0,0 +1,6 @@ +result code = -1 +standard error = { +tests/front-end/parser-error-unclosed-curly.slang(4): error 20001: unexpected end of file, expected '}' +} +standard output = { +} diff --git a/tests/front-end/parser-error-unclosed-curly.spire.expected b/tests/front-end/parser-error-unclosed-curly.spire.expected deleted file mode 100644 index 437b6eab0..000000000 --- a/tests/front-end/parser-error-unclosed-curly.spire.expected +++ /dev/null @@ -1,6 +0,0 @@ -result code = -1 -standard error = { -Tests/FrontEnd/parser-error-unclosed-curly.spire(4): error 20001: unexpected end of file, expected '}' -} -standard output = { -} diff --git a/tests/front-end/parser-using-file-a.spireh b/tests/front-end/parser-using-file-a.slang.h index 62e6acd06..62e6acd06 100644 --- a/tests/front-end/parser-using-file-a.spireh +++ b/tests/front-end/parser-using-file-a.slang.h diff --git a/tests/front-end/parser-using-file.spire.disabled b/tests/front-end/parser-using-file.spire.disabled index f93fb576c..b2e1648f7 100644 --- a/tests/front-end/parser-using-file.spire.disabled +++ b/tests/front-end/parser-using-file.spire.disabled @@ -1,6 +1,6 @@ //TEST:SIMPLE: // test that we can include a file via `using` -using "parser-using-file-a.spireh"; +using "parser-using-file-a.slang.h"; float base( float x ) { return a(x); }
\ No newline at end of file diff --git a/tests/front-end/pipeline-simple.spireh b/tests/front-end/pipeline-simple.slang.h index 55afd693c..6a6dc1b1c 100644 --- a/tests/front-end/pipeline-simple.spireh +++ b/tests/front-end/pipeline-simple.slang.h @@ -1,4 +1,4 @@ -// pipeline-simple.spireh +// pipeline-simple.slang.h // TODO(tfoley): strip this down to a minimal pipeline diff --git a/tests/front-end/struct.spire b/tests/front-end/struct.slang index 8347f8d58..16b1bebc7 100644 --- a/tests/front-end/struct.spire +++ b/tests/front-end/struct.slang @@ -2,7 +2,7 @@ // test that `struct` decls work // Note(tfoley): disabled during syntax transition -// #include "pipeline-simple.spireh" +// #include "pipeline-simple.slang.h" // struct declaration struct Foo diff --git a/tests/front-end/typedef.spire b/tests/front-end/typedef.slang index 7e96bead0..7e96bead0 100644 --- a/tests/front-end/typedef.spire +++ b/tests/front-end/typedef.slang diff --git a/tests/preprocessor/define-function-like.spire b/tests/preprocessor/define-function-like.slang index f1dd9caa4..f1dd9caa4 100644 --- a/tests/preprocessor/define-function-like.spire +++ b/tests/preprocessor/define-function-like.slang diff --git a/tests/preprocessor/define-function-like.slang.expected b/tests/preprocessor/define-function-like.slang.expected new file mode 100644 index 000000000..aed62dc31 --- /dev/null +++ b/tests/preprocessor/define-function-like.slang.expected @@ -0,0 +1,7 @@ +result code = -1 +standard error = { +tests/preprocessor/define-function-like.slang(16): error 30015: undefined identifier 'x'. +tests/preprocessor/define-function-like.slang(16): error 30015: undefined identifier 'x'. +} +standard output = { +} diff --git a/tests/preprocessor/define-function-like.spire.expected b/tests/preprocessor/define-function-like.spire.expected deleted file mode 100644 index e7b2a582a..000000000 --- a/tests/preprocessor/define-function-like.spire.expected +++ /dev/null @@ -1,7 +0,0 @@ -result code = -1 -standard error = { -Tests/Preprocessor/define-function-like.spire(16): error 30015: undefined identifier 'x'. -Tests/Preprocessor/define-function-like.spire(16): error 30015: undefined identifier 'x'. -} -standard output = { -} diff --git a/tests/preprocessor/define-simple.spire b/tests/preprocessor/define-simple.slang index 26436b258..26436b258 100644 --- a/tests/preprocessor/define-simple.spire +++ b/tests/preprocessor/define-simple.slang diff --git a/tests/preprocessor/if.spire b/tests/preprocessor/if.slang index fe5948c33..fe5948c33 100644 --- a/tests/preprocessor/if.spire +++ b/tests/preprocessor/if.slang diff --git a/tests/preprocessor/ifdef.spire b/tests/preprocessor/ifdef.slang index a3ca82838..a3ca82838 100644 --- a/tests/preprocessor/ifdef.spire +++ b/tests/preprocessor/ifdef.slang diff --git a/tests/preprocessor/include-a.spireh b/tests/preprocessor/include-a.slang.h index 8fecc6a98..8fecc6a98 100644 --- a/tests/preprocessor/include-a.spireh +++ b/tests/preprocessor/include-a.slang.h diff --git a/tests/preprocessor/include.spire b/tests/preprocessor/include.slang index 8feca21cc..e21d23877 100644 --- a/tests/preprocessor/include.spire +++ b/tests/preprocessor/include.slang @@ -3,6 +3,6 @@ int foo() { return 0; } -#include "include-a.spireh" +#include "include-a.slang.h" int baz() { return bar(); }
\ No newline at end of file |
