OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Remove illegal characters from tests

Browse Source 
Some of the existing tests were using '@' and '"' incidentally within the test
body. Neither of these characters are actually legal for GLSL. And since we
are planning to start generating errors for illegal characters, we need to
first make the test suite clean.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Carl Worth
2014-08-05 16:33:05 -07:00
committed by Kenneth Graunke
parent 5363518705
commit 3fbdac28d5
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/glcpp/tests/082-invalid-paste.c
View File

@@ -2,6 +2,6 @@
PASTE(<,>) PASTE(<,>)
PASTE(0,abc) PASTE(0,abc)
PASTE(1,=) PASTE(1,=)
PASTE(2,@) PASTE(2,~)
PASTE(3,-4) PASTE(3,-4)
PASTE(4,+5.2) PASTE(4,+5.2)

2
src/compiler/glsl/glcpp/tests/082-invalid-paste.c.expected
View File

@@ -5,7 +5,7 @@ Pasting "0" and "abc" does not give a valid preprocessing token.
0:4(7): preprocessor error: 0:4(7): preprocessor error:
Pasting "1" and "=" does not give a valid preprocessing token. Pasting "1" and "=" does not give a valid preprocessing token.
0:5(7): preprocessor error: 0:5(7): preprocessor error:
Pasting "2" and "@" does not give a valid preprocessing token. Pasting "2" and "~" does not give a valid preprocessing token.
0:6(7): preprocessor error: 0:6(7): preprocessor error:
Pasting "3" and "-" does not give a valid preprocessing token. Pasting "3" and "-" does not give a valid preprocessing token.
0:7(7): preprocessor error: 0:7(7): preprocessor error:

2
src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c
View File

@@ -1,7 +1,7 @@
1. Number of dalmations: __LINE__ __FILE__ __LINE__ 1. Number of dalmations: __LINE__ __FILE__ __LINE__
2. Nominal visual acuity: __LINE__ __FILE__ / __LINE__ __FILE__ 2. Nominal visual acuity: __LINE__ __FILE__ / __LINE__ __FILE__
3. Battle of Thermopylae, as film: __LINE__ __FILE__ __FILE__ 3. Battle of Thermopylae, as film: __LINE__ __FILE__ __FILE__
4. HTTP code for "Not Found": __LINE__ __FILE__ __LINE__ 4. HTTP code for Not Found: __LINE__ __FILE__ __LINE__
5. Hexadecimal for 20560: __LINE__ __FILE__ __LINE__ __FILE__ 5. Hexadecimal for 20560: __LINE__ __FILE__ __LINE__ __FILE__
6: Zip code for Nortonville, KS: __LINE__ __LINE__ __FILE__ __LINE__ __FILE__ 6: Zip code for Nortonville, KS: __LINE__ __LINE__ __FILE__ __LINE__ __FILE__
7. James Bond, as a number: __FILE__ __FILE__ __LINE__ 7. James Bond, as a number: __FILE__ __FILE__ __LINE__

2
src/compiler/glsl/glcpp/tests/113-line-and-file-macros.c.expected
View File

@@ -1,7 +1,7 @@
1. Number of dalmations: 1 0 1 1. Number of dalmations: 1 0 1
2. Nominal visual acuity: 2 0 / 2 0 2. Nominal visual acuity: 2 0 / 2 0
3. Battle of Thermopylae, as film: 3 0 0 3. Battle of Thermopylae, as film: 3 0 0
4. HTTP code for "Not Found": 4 0 4 4. HTTP code for Not Found: 4 0 4
5. Hexadecimal for 20560: 5 0 5 0 5. Hexadecimal for 20560: 5 0 5 0
6: Zip code for Nortonville, KS: 6 6 0 6 0 6: Zip code for Nortonville, KS: 6 6 0 6 0
7. James Bond, as a number: 0 0 7 7. James Bond, as a number: 0 0 7

2
src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c
View File

@@ -1,7 +1,7 @@
#define PASTE3(a,b,c) a ## b ## c #define PASTE3(a,b,c) a ## b ## c
#define PASTE4(a,b,c,d) a ## b ## c ## d #define PASTE4(a,b,c,d) a ## b ## c ## d
#define PASTE5(a,b,c,d,e) a ## b ## c ## d ## e #define PASTE5(a,b,c,d,e) a ## b ## c ## d ## e
4. HTTP code for "Not Found": PASTE3(__LINE__, __FILE__ , __LINE__) 4. HTTP code for Not Found: PASTE3(__LINE__, __FILE__ , __LINE__)
5. Hexadecimal for 20560: PASTE4(__LINE__, __FILE__, __LINE__, __FILE__) 5. Hexadecimal for 20560: PASTE4(__LINE__, __FILE__, __LINE__, __FILE__)
6: Zip code for Nortonville, KS: PASTE5(__LINE__, __LINE__, __FILE__, __LINE__, __FILE__) 6: Zip code for Nortonville, KS: PASTE5(__LINE__, __LINE__, __FILE__, __LINE__, __FILE__)
7. James Bond, as a number: PASTE3(__FILE__, __FILE__, __LINE__) 7. James Bond, as a number: PASTE3(__FILE__, __FILE__, __LINE__)

2
src/compiler/glsl/glcpp/tests/114-paste-integer-tokens.c.expected
View File

@@ -1,7 +1,7 @@
4. HTTP code for "Not Found": 404 4. HTTP code for Not Found: 404
5. Hexadecimal for 20560: 5050 5. Hexadecimal for 20560: 5050
6: Zip code for Nortonville, KS: 66060 6: Zip code for Nortonville, KS: 66060
7. James Bond, as a number: 007 7. James Bond, as a number: 007