summaryrefslogtreecommitdiffstats
path: root/tests/diagnostics
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-06-12 12:42:17 -0700
committerTim Foley <tfoley@nvidia.com>2017-06-12 13:00:47 -0700
commit5b49974bd6ddd248b5ee1b1e29c0acfc3c422a3a (patch)
tree2e939a9ef7b972944b71ea3f7d11a17af844c3fe /tests/diagnostics
parentd1f11a29f8a48eecd47ac64c8635ed062cba982d (diff)
Rename tests from `*.spire` to `*.slang`
Many of the existing test cases were being skipped on accident, because their file names used `.spire` and the test tool was now looking for `.slang`
Diffstat (limited to 'tests/diagnostics')
-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.expected7
-rw-r--r--tests/diagnostics/missing-file.spire.expected7
-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
31 files changed, 22 insertions, 22 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 = {
}