Rename ES2 error tests from 'C' through 'G' to .rts.
A few tests received minor tweaks to make them Runtime Effect-friendly.
Bug: skia:13042
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Arman Uguray <armansito@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Change-Id: I7734390c9fadb53bd74b7b395df611db935fcc0b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524098
Reviewed-by: Derek Sollenberger <djsollen@google.com>
diff --git a/gn/sksl_tests.gni b/gn/sksl_tests.gni
index 213e29b..c0bf659 100644
--- a/gn/sksl_tests.gni
+++ b/gn/sksl_tests.gni
@@ -43,25 +43,25 @@
"/sksl/errors/BitShiftFloatVector.rts",
"/sksl/errors/BooleanArithmetic.sksl",
"/sksl/errors/BreakOutsideLoop.rts",
- "/sksl/errors/CallNonFunction.sksl",
+ "/sksl/errors/CallNonFunction.rts",
"/sksl/errors/CanExitWithoutReturningValue.sksl",
- "/sksl/errors/ComparisonDimensional.sksl",
- "/sksl/errors/ConstructorArgumentCount.sksl",
- "/sksl/errors/ConstructorTypeMismatch.sksl",
- "/sksl/errors/ContinueOutsideLoop.sksl",
- "/sksl/errors/DivideByZero.sksl",
+ "/sksl/errors/ComparisonDimensional.rts",
+ "/sksl/errors/ConstructorArgumentCount.rts",
+ "/sksl/errors/ConstructorTypeMismatch.rts",
+ "/sksl/errors/ContinueOutsideLoop.rts",
+ "/sksl/errors/DivideByZero.rts",
"/sksl/errors/DoTypeMismatch.sksl",
- "/sksl/errors/DuplicateFunction.sksl",
+ "/sksl/errors/DuplicateFunction.rts",
"/sksl/errors/DuplicateOutput.sksl",
- "/sksl/errors/DuplicateSymbol.sksl",
- "/sksl/errors/EmptyArray.sksl",
- "/sksl/errors/EmptyStruct.sksl",
- "/sksl/errors/ErrorsInDeadCode.sksl",
- "/sksl/errors/FloatRemainder.sksl",
+ "/sksl/errors/DuplicateSymbol.rts",
+ "/sksl/errors/EmptyArray.rts",
+ "/sksl/errors/EmptyStruct.rts",
+ "/sksl/errors/ErrorsInDeadCode.rts",
+ "/sksl/errors/FloatRemainder.rts",
"/sksl/errors/ForInitStmt.sksl",
- "/sksl/errors/ForTypeMismatch.sksl",
- "/sksl/errors/FunctionParameterOfVoid.sksl",
- "/sksl/errors/GenericArgumentMismatch.sksl",
+ "/sksl/errors/ForTypeMismatch.rts",
+ "/sksl/errors/FunctionParameterOfVoid.rts",
+ "/sksl/errors/GenericArgumentMismatch.rts",
"/sksl/errors/PrecisionQualifiersDisallowed.sksl",
"/sksl/errors/IfTypeMismatch.sksl",
"/sksl/errors/InVarWithInitializerExpression.sksl",
diff --git a/resources/sksl/errors/CallNonFunction.sksl b/resources/sksl/errors/CallNonFunction.rts
similarity index 79%
rename from resources/sksl/errors/CallNonFunction.sksl
rename to resources/sksl/errors/CallNonFunction.rts
index 0ce09c6..0d4af2c 100644
--- a/resources/sksl/errors/CallNonFunction.sksl
+++ b/resources/sksl/errors/CallNonFunction.rts
@@ -1,4 +1,4 @@
-void main() {
+void func() {
float x = 3;
x();
}
diff --git a/resources/sksl/errors/ComparisonDimensional.sksl b/resources/sksl/errors/ComparisonDimensional.rts
similarity index 100%
rename from resources/sksl/errors/ComparisonDimensional.sksl
rename to resources/sksl/errors/ComparisonDimensional.rts
diff --git a/resources/sksl/errors/ConstructorArgumentCount.sksl b/resources/sksl/errors/ConstructorArgumentCount.rts
similarity index 100%
rename from resources/sksl/errors/ConstructorArgumentCount.sksl
rename to resources/sksl/errors/ConstructorArgumentCount.rts
diff --git a/resources/sksl/errors/ConstructorTypeMismatch.sksl b/resources/sksl/errors/ConstructorTypeMismatch.rts
similarity index 100%
rename from resources/sksl/errors/ConstructorTypeMismatch.sksl
rename to resources/sksl/errors/ConstructorTypeMismatch.rts
diff --git a/resources/sksl/errors/ContinueOutsideLoop.rts b/resources/sksl/errors/ContinueOutsideLoop.rts
new file mode 100644
index 0000000..6e557fa
--- /dev/null
+++ b/resources/sksl/errors/ContinueOutsideLoop.rts
@@ -0,0 +1,15 @@
+void outside_for() {
+ for (int x=0; x<10; ++x) {}
+ continue;
+}
+
+void inside_switch() {
+ switch (1) {
+ default: continue;
+ }
+}
+
+/*%%*
+continue statement must be inside a loop
+continue statement must be inside a loop
+*%%*/
diff --git a/resources/sksl/errors/ContinueOutsideLoop.sksl b/resources/sksl/errors/ContinueOutsideLoop.sksl
deleted file mode 100644
index e4b98f2..0000000
--- a/resources/sksl/errors/ContinueOutsideLoop.sksl
+++ /dev/null
@@ -1,7 +0,0 @@
-void outside_for() { for (;;) {} continue; }
-void inside_switch() { switch (1) { default: continue; } }
-
-/*%%*
-continue statement must be inside a loop
-continue statement must be inside a loop
-*%%*/
diff --git a/resources/sksl/errors/DivideByZero.sksl b/resources/sksl/errors/DivideByZero.rts
similarity index 100%
rename from resources/sksl/errors/DivideByZero.sksl
rename to resources/sksl/errors/DivideByZero.rts
diff --git a/resources/sksl/errors/DuplicateFunction.rts b/resources/sksl/errors/DuplicateFunction.rts
new file mode 100644
index 0000000..1acf05c
--- /dev/null
+++ b/resources/sksl/errors/DuplicateFunction.rts
@@ -0,0 +1,6 @@
+void func() {}
+void func() {}
+
+/*%%*
+duplicate definition of void func()
+*%%*/
diff --git a/resources/sksl/errors/DuplicateFunction.sksl b/resources/sksl/errors/DuplicateFunction.sksl
deleted file mode 100644
index 4125e2c..0000000
--- a/resources/sksl/errors/DuplicateFunction.sksl
+++ /dev/null
@@ -1,6 +0,0 @@
-void main() {}
-void main() {}
-
-/*%%*
-duplicate definition of void main()
-*%%*/
diff --git a/resources/sksl/errors/DuplicateSymbol.sksl b/resources/sksl/errors/DuplicateSymbol.rts
similarity index 64%
rename from resources/sksl/errors/DuplicateSymbol.sksl
rename to resources/sksl/errors/DuplicateSymbol.rts
index 8785fcc..ddf82b1 100644
--- a/resources/sksl/errors/DuplicateSymbol.sksl
+++ b/resources/sksl/errors/DuplicateSymbol.rts
@@ -1,13 +1,13 @@
int x;
int x;
-int main;
-void main() {
+int func;
+void func() {
int y,y;
}
/*%%*
symbol 'x' was already defined
-symbol 'main' was already defined
+symbol 'func' was already defined
symbol 'y' was already defined
*%%*/
diff --git a/resources/sksl/errors/EmptyArray.sksl b/resources/sksl/errors/EmptyArray.rts
similarity index 100%
rename from resources/sksl/errors/EmptyArray.sksl
rename to resources/sksl/errors/EmptyArray.rts
diff --git a/resources/sksl/errors/EmptyStruct.sksl b/resources/sksl/errors/EmptyStruct.rts
similarity index 100%
rename from resources/sksl/errors/EmptyStruct.sksl
rename to resources/sksl/errors/EmptyStruct.rts
diff --git a/resources/sksl/errors/ErrorsInDeadCode.sksl b/resources/sksl/errors/ErrorsInDeadCode.rts
similarity index 100%
rename from resources/sksl/errors/ErrorsInDeadCode.sksl
rename to resources/sksl/errors/ErrorsInDeadCode.rts
diff --git a/resources/sksl/errors/FloatRemainder.sksl b/resources/sksl/errors/FloatRemainder.rts
similarity index 100%
rename from resources/sksl/errors/FloatRemainder.sksl
rename to resources/sksl/errors/FloatRemainder.rts
diff --git a/resources/sksl/errors/ForTypeMismatch.sksl b/resources/sksl/errors/ForTypeMismatch.rts
similarity index 84%
rename from resources/sksl/errors/ForTypeMismatch.sksl
rename to resources/sksl/errors/ForTypeMismatch.rts
index 590027e..82ea19a 100644
--- a/resources/sksl/errors/ForTypeMismatch.sksl
+++ b/resources/sksl/errors/ForTypeMismatch.rts
@@ -1,4 +1,4 @@
-void main() {
+void func() {
for (int x = 0; x; x++) {}
}
diff --git a/resources/sksl/errors/FunctionParameterOfVoid.sksl b/resources/sksl/errors/FunctionParameterOfVoid.rts
similarity index 100%
rename from resources/sksl/errors/FunctionParameterOfVoid.sksl
rename to resources/sksl/errors/FunctionParameterOfVoid.rts
diff --git a/resources/sksl/errors/GenericArgumentMismatch.sksl b/resources/sksl/errors/GenericArgumentMismatch.rts
similarity index 100%
rename from resources/sksl/errors/GenericArgumentMismatch.sksl
rename to resources/sksl/errors/GenericArgumentMismatch.rts
diff --git a/tests/sksl/errors/ContinueOutsideLoop.glsl b/tests/sksl/errors/ContinueOutsideLoop.glsl
index e841af8..25cbcdc 100644
--- a/tests/sksl/errors/ContinueOutsideLoop.glsl
+++ b/tests/sksl/errors/ContinueOutsideLoop.glsl
@@ -1,5 +1,5 @@
### Compilation failed:
-error: 1: continue statement must be inside a loop
-error: 2: continue statement must be inside a loop
+error: 3: continue statement must be inside a loop
+error: 8: continue statement must be inside a loop
2 errors
diff --git a/tests/sksl/errors/DuplicateFunction.glsl b/tests/sksl/errors/DuplicateFunction.glsl
index 7672b01..72442d1 100644
--- a/tests/sksl/errors/DuplicateFunction.glsl
+++ b/tests/sksl/errors/DuplicateFunction.glsl
@@ -1,4 +1,4 @@
### Compilation failed:
-error: 2: duplicate definition of void main()
+error: 2: duplicate definition of void func()
1 error
diff --git a/tests/sksl/errors/DuplicateSymbol.glsl b/tests/sksl/errors/DuplicateSymbol.glsl
index 9e5cb06..c39dd6a 100644
--- a/tests/sksl/errors/DuplicateSymbol.glsl
+++ b/tests/sksl/errors/DuplicateSymbol.glsl
@@ -1,6 +1,6 @@
### Compilation failed:
error: 2: symbol 'x' was already defined
-error: 5: symbol 'main' was already defined
+error: 5: symbol 'func' was already defined
error: 6: symbol 'y' was already defined
3 errors
