diff options
| author | Emil Velikov <[email protected]> | 2016-01-18 12:16:48 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-01-26 16:08:33 +0000 |
| commit | eb63640c1d38a200a7b1540405051d3ff79d0d8a (patch) | |
| tree | da46321a41f309b1d02aeb14d5d5487791c45aeb /src/glsl/glcpp/tests | |
| parent | a39a8fbbaa129f4e52f2a3ad2747182e9a74d910 (diff) | |
glsl: move to compiler/
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Acked-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/tests')
291 files changed, 0 insertions, 2440 deletions
diff --git a/src/glsl/glcpp/tests/.gitignore b/src/glsl/glcpp/tests/.gitignore deleted file mode 100644 index 3802c850a3e..00000000000 --- a/src/glsl/glcpp/tests/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -subtest-cr/ -subtest-lf/ -subtest-cr-lf/ -subtest-lf-cr/ diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c b/src/glsl/glcpp/tests/000-content-with-spaces.c deleted file mode 100644 index 1f2320e6fc1..00000000000 --- a/src/glsl/glcpp/tests/000-content-with-spaces.c +++ /dev/null @@ -1 +0,0 @@ - this is four tokens with spaces diff --git a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected b/src/glsl/glcpp/tests/000-content-with-spaces.c.expected deleted file mode 100644 index 00791910ed5..00000000000 --- a/src/glsl/glcpp/tests/000-content-with-spaces.c.expected +++ /dev/null @@ -1 +0,0 @@ - this is four tokens with spaces diff --git a/src/glsl/glcpp/tests/001-define.c b/src/glsl/glcpp/tests/001-define.c deleted file mode 100644 index cbf2fee0e75..00000000000 --- a/src/glsl/glcpp/tests/001-define.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo 1 -foo diff --git a/src/glsl/glcpp/tests/001-define.c.expected b/src/glsl/glcpp/tests/001-define.c.expected deleted file mode 100644 index a464d9da742..00000000000 --- a/src/glsl/glcpp/tests/001-define.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -1 diff --git a/src/glsl/glcpp/tests/002-define-chain.c b/src/glsl/glcpp/tests/002-define-chain.c deleted file mode 100644 index 87d75c68751..00000000000 --- a/src/glsl/glcpp/tests/002-define-chain.c +++ /dev/null @@ -1,3 +0,0 @@ -#define foo 1 -#define bar foo -bar diff --git a/src/glsl/glcpp/tests/002-define-chain.c.expected b/src/glsl/glcpp/tests/002-define-chain.c.expected deleted file mode 100644 index c6c9ee38a9e..00000000000 --- a/src/glsl/glcpp/tests/002-define-chain.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -1 diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c b/src/glsl/glcpp/tests/003-define-chain-reverse.c deleted file mode 100644 index a18b724eca0..00000000000 --- a/src/glsl/glcpp/tests/003-define-chain-reverse.c +++ /dev/null @@ -1,3 +0,0 @@ -#define bar foo -#define foo 1 -bar diff --git a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected b/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected deleted file mode 100644 index c6c9ee38a9e..00000000000 --- a/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -1 diff --git a/src/glsl/glcpp/tests/004-define-recursive.c b/src/glsl/glcpp/tests/004-define-recursive.c deleted file mode 100644 index 2ac56ea3dcf..00000000000 --- a/src/glsl/glcpp/tests/004-define-recursive.c +++ /dev/null @@ -1,6 +0,0 @@ -#define foo bar -#define bar baz -#define baz foo -foo -bar -baz diff --git a/src/glsl/glcpp/tests/004-define-recursive.c.expected b/src/glsl/glcpp/tests/004-define-recursive.c.expected deleted file mode 100644 index 2d07687f8ca..00000000000 --- a/src/glsl/glcpp/tests/004-define-recursive.c.expected +++ /dev/null @@ -1,6 +0,0 @@ - - - -foo -bar -baz diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c b/src/glsl/glcpp/tests/005-define-composite-chain.c deleted file mode 100644 index f5521df968d..00000000000 --- a/src/glsl/glcpp/tests/005-define-composite-chain.c +++ /dev/null @@ -1,3 +0,0 @@ -#define foo 1 -#define bar a foo -bar diff --git a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected b/src/glsl/glcpp/tests/005-define-composite-chain.c.expected deleted file mode 100644 index 892975c268c..00000000000 --- a/src/glsl/glcpp/tests/005-define-composite-chain.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -a 1 diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c deleted file mode 100644 index 4bb91a1221a..00000000000 --- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c +++ /dev/null @@ -1,3 +0,0 @@ -#define bar a foo -#define foo 1 -bar diff --git a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected deleted file mode 100644 index 892975c268c..00000000000 --- a/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -a 1 diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c b/src/glsl/glcpp/tests/007-define-composite-recursive.c deleted file mode 100644 index 5784565bdf3..00000000000 --- a/src/glsl/glcpp/tests/007-define-composite-recursive.c +++ /dev/null @@ -1,6 +0,0 @@ -#define foo a bar -#define bar b baz -#define baz c foo -foo -bar -baz diff --git a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected b/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected deleted file mode 100644 index 0b0b477d9df..00000000000 --- a/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected +++ /dev/null @@ -1,6 +0,0 @@ - - - -a b c foo -b c a bar -c a b baz diff --git a/src/glsl/glcpp/tests/008-define-empty.c b/src/glsl/glcpp/tests/008-define-empty.c deleted file mode 100644 index b1bd17ec215..00000000000 --- a/src/glsl/glcpp/tests/008-define-empty.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo -foo diff --git a/src/glsl/glcpp/tests/008-define-empty.c.expected b/src/glsl/glcpp/tests/008-define-empty.c.expected deleted file mode 100644 index d148bc8e800..00000000000 --- a/src/glsl/glcpp/tests/008-define-empty.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/glsl/glcpp/tests/009-undef.c b/src/glsl/glcpp/tests/009-undef.c deleted file mode 100644 index 3fc1fb44243..00000000000 --- a/src/glsl/glcpp/tests/009-undef.c +++ /dev/null @@ -1,4 +0,0 @@ -#define foo 1 -foo -#undef foo -foo diff --git a/src/glsl/glcpp/tests/009-undef.c.expected b/src/glsl/glcpp/tests/009-undef.c.expected deleted file mode 100644 index 9c0b35a4518..00000000000 --- a/src/glsl/glcpp/tests/009-undef.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - -1 - -foo diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c b/src/glsl/glcpp/tests/010-undef-re-define.c deleted file mode 100644 index 32ff73798b1..00000000000 --- a/src/glsl/glcpp/tests/010-undef-re-define.c +++ /dev/null @@ -1,6 +0,0 @@ -#define foo 1 -foo -#undef foo -foo -#define foo 2 -foo diff --git a/src/glsl/glcpp/tests/010-undef-re-define.c.expected b/src/glsl/glcpp/tests/010-undef-re-define.c.expected deleted file mode 100644 index 5970f49028e..00000000000 --- a/src/glsl/glcpp/tests/010-undef-re-define.c.expected +++ /dev/null @@ -1,6 +0,0 @@ - -1 - -foo - -2 diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c b/src/glsl/glcpp/tests/011-define-func-empty.c deleted file mode 100644 index d9ce13c2284..00000000000 --- a/src/glsl/glcpp/tests/011-define-func-empty.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo() -foo() diff --git a/src/glsl/glcpp/tests/011-define-func-empty.c.expected b/src/glsl/glcpp/tests/011-define-func-empty.c.expected deleted file mode 100644 index d148bc8e800..00000000000 --- a/src/glsl/glcpp/tests/011-define-func-empty.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c b/src/glsl/glcpp/tests/012-define-func-no-args.c deleted file mode 100644 index c2bb730b115..00000000000 --- a/src/glsl/glcpp/tests/012-define-func-no-args.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo() bar -foo() diff --git a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected b/src/glsl/glcpp/tests/012-define-func-no-args.c.expected deleted file mode 100644 index 9f075f26004..00000000000 --- a/src/glsl/glcpp/tests/012-define-func-no-args.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -bar diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c deleted file mode 100644 index f78fb8b118a..00000000000 --- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x) 1 -foo(bar) diff --git a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected deleted file mode 100644 index a464d9da742..00000000000 --- a/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -1 diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c deleted file mode 100644 index 11feb2624b7..00000000000 --- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x,y) 1 -foo(bar,baz) diff --git a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected deleted file mode 100644 index a464d9da742..00000000000 --- a/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -1 diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c b/src/glsl/glcpp/tests/015-define-object-with-parens.c deleted file mode 100644 index 558da9c617b..00000000000 --- a/src/glsl/glcpp/tests/015-define-object-with-parens.c +++ /dev/null @@ -1,4 +0,0 @@ -#define foo ()1 -foo() -#define bar ()2 -bar() diff --git a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected b/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected deleted file mode 100644 index a70321a4c51..00000000000 --- a/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - -()1() - -()2() diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c b/src/glsl/glcpp/tests/016-define-func-1-arg.c deleted file mode 100644 index a2e2404c7c1..00000000000 --- a/src/glsl/glcpp/tests/016-define-func-1-arg.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x) ((x)+1) -foo(bar) diff --git a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected b/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected deleted file mode 100644 index 6bfe04f7381..00000000000 --- a/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -((bar)+1) diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c b/src/glsl/glcpp/tests/017-define-func-2-args.c deleted file mode 100644 index c7253835278..00000000000 --- a/src/glsl/glcpp/tests/017-define-func-2-args.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x,y) ((x)*(y)) -foo(bar,baz) diff --git a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected b/src/glsl/glcpp/tests/017-define-func-2-args.c.expected deleted file mode 100644 index f7a2b8c26cb..00000000000 --- a/src/glsl/glcpp/tests/017-define-func-2-args.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -((bar)*(baz)) diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c deleted file mode 100644 index 668130b8f9b..00000000000 --- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c +++ /dev/null @@ -1,3 +0,0 @@ -#define x 0 -#define foo(x) x -foo(1) diff --git a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected deleted file mode 100644 index c6c9ee38a9e..00000000000 --- a/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -1 diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c deleted file mode 100644 index c4e62b25508..00000000000 --- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x) (x) -foo(this is more than one word) diff --git a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected deleted file mode 100644 index 1e89b8cfd0c..00000000000 --- a/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -(this is more than one word) diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c deleted file mode 100644 index 3049ad15465..00000000000 --- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x,y) x,two fish,red fish,y -foo(one fish, blue fish) diff --git a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected deleted file mode 100644 index 19f59f5ecb7..00000000000 --- a/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -one fish,two fish,red fish,blue fish diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c b/src/glsl/glcpp/tests/021-define-func-compose.c deleted file mode 100644 index 21ddd0e65f9..00000000000 --- a/src/glsl/glcpp/tests/021-define-func-compose.c +++ /dev/null @@ -1,3 +0,0 @@ -#define bar(x) (1+(x)) -#define foo(y) (2*(y)) -foo(bar(3)) diff --git a/src/glsl/glcpp/tests/021-define-func-compose.c.expected b/src/glsl/glcpp/tests/021-define-func-compose.c.expected deleted file mode 100644 index 87f51f0baca..00000000000 --- a/src/glsl/glcpp/tests/021-define-func-compose.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -(2*((1+(3)))) diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c deleted file mode 100644 index c20d73a4a28..00000000000 --- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x) (x) -foo(argument(including parens)for the win) diff --git a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected deleted file mode 100644 index 1dfc6698bb7..00000000000 --- a/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -(argument(including parens)for the win) diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c b/src/glsl/glcpp/tests/023-define-extra-whitespace.c deleted file mode 100644 index 7ebfed6516c..00000000000 --- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c +++ /dev/null @@ -1,8 +0,0 @@ -#define noargs() 1 -# define onearg(foo) foo - # define twoargs( x , y ) x y - # define threeargs( a , b , c ) a b c -noargs ( ) -onearg ( 2 ) -twoargs ( 3 , 4 ) -threeargs ( 5 , 6 , 7 ) diff --git a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected b/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected deleted file mode 100644 index 9c58275d0f9..00000000000 --- a/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected +++ /dev/null @@ -1,8 +0,0 @@ - - - - -1 -2 -3 4 -5 6 7 diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c deleted file mode 100644 index e788adce30c..00000000000 --- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c +++ /dev/null @@ -1,3 +0,0 @@ -#define foo foo -#define bar foo -bar diff --git a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected deleted file mode 100644 index 15600af546b..00000000000 --- a/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -foo diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c deleted file mode 100644 index b433671d1bf..00000000000 --- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(bar) bar -foo bar diff --git a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected deleted file mode 100644 index 4a59f0520e3..00000000000 --- a/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -foo bar diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c deleted file mode 100644 index 0d837405309..00000000000 --- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c +++ /dev/null @@ -1,6 +0,0 @@ -#define foo(a) bar - -foo -( -1 -) diff --git a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected deleted file mode 100644 index 5e3c70f2cc5..00000000000 --- a/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -bar diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c deleted file mode 100644 index 5ccb52caba5..00000000000 --- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c +++ /dev/null @@ -1,3 +0,0 @@ -#define failure() success -#define foo failure() -foo diff --git a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected deleted file mode 100644 index 94c15f95059..00000000000 --- a/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -success diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c deleted file mode 100644 index 44962a71876..00000000000 --- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c +++ /dev/null @@ -1,3 +0,0 @@ -#define success() failure -#define foo success -foo diff --git a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected deleted file mode 100644 index 94c15f95059..00000000000 --- a/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -success diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c deleted file mode 100644 index 261f7d28fc2..00000000000 --- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c +++ /dev/null @@ -1,3 +0,0 @@ -#define bar(failure) failure -#define foo bar(success) -foo diff --git a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected deleted file mode 100644 index 94c15f95059..00000000000 --- a/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -success diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c deleted file mode 100644 index e56fbefd62d..00000000000 --- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c +++ /dev/null @@ -1,4 +0,0 @@ -#define baz(failure) failure -#define bar(failure) failure -#define foo bar(baz(success)) -foo diff --git a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected deleted file mode 100644 index bed826e7831..00000000000 --- a/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - - -success diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c deleted file mode 100644 index 3f4c8744dff..00000000000 --- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c +++ /dev/null @@ -1,4 +0,0 @@ -#define baz(failure) failure -#define bar(failure) failure -#define foo() bar(baz(success)) -foo() diff --git a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected deleted file mode 100644 index bed826e7831..00000000000 --- a/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - - -success diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c b/src/glsl/glcpp/tests/032-define-func-self-recurse.c deleted file mode 100644 index b3ac70f499c..00000000000 --- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(a) foo(2*(a)) -foo(3) diff --git a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected b/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected deleted file mode 100644 index 983f9417401..00000000000 --- a/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -foo(2*(3)) diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c b/src/glsl/glcpp/tests/033-define-func-self-compose.c deleted file mode 100644 index f65e48286cf..00000000000 --- a/src/glsl/glcpp/tests/033-define-func-self-compose.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(a) foo(2*(a)) -foo(foo(3)) diff --git a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected b/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected deleted file mode 100644 index 08183623643..00000000000 --- a/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -foo(2*(foo(2*(3)))) diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c deleted file mode 100644 index 209a5f7e07c..00000000000 --- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(bar) bar -foo(foo) diff --git a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected deleted file mode 100644 index 3f808fe665d..00000000000 --- a/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -foo diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c deleted file mode 100644 index c307fbe830f..00000000000 --- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(bar) bar -foo(1+foo) diff --git a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected deleted file mode 100644 index 09dfdd64e9b..00000000000 --- a/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -1+foo diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c deleted file mode 100644 index b21ff336738..00000000000 --- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c +++ /dev/null @@ -1,3 +0,0 @@ -#define bar success -#define foo(x) x -foo(more bar) diff --git a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected deleted file mode 100644 index 580ed9599c5..00000000000 --- a/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -more success diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c deleted file mode 100644 index b3a2f37f1b9..00000000000 --- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c +++ /dev/null @@ -1,3 +0,0 @@ -#define expand(x) expand(x once) -#define foo(x) x -foo(expand(just)) diff --git a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected deleted file mode 100644 index e804d7e4f9f..00000000000 --- a/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -expand(just once) diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c b/src/glsl/glcpp/tests/038-func-arg-with-commas.c deleted file mode 100644 index 1407c7d6e3c..00000000000 --- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c +++ /dev/null @@ -1,2 +0,0 @@ -#define foo(x) success -foo(argument (with,embedded , commas) -- tricky) diff --git a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected b/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected deleted file mode 100644 index 6544adb3a25..00000000000 --- a/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -success diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c deleted file mode 100644 index a7c053bb402..00000000000 --- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c +++ /dev/null @@ -1,24 +0,0 @@ -/* This works. */ -#define foo(a) (a) -#define bar two,words -foo(bar) - -/* So does this. */ -#define foo2(a,b) (a separate b) -#define foo2_wrap(a) foo2(a) -foo2_wrap(bar) - -/* But this generates an error. */ -#define foo_wrap(a) foo(a) -foo_wrap(bar) - -/* Adding parentheses to foo_wrap fixes it. */ -#define foo_wrap_parens(a) foo((a)) -foo_wrap_parens(bar) - -/* As does adding parentheses to bar */ -#define bar_parens (two,words) -foo_wrap(bar_parens) -foo_wrap_parens(bar_parens) - - diff --git a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected deleted file mode 100644 index 4cc795338b2..00000000000 --- a/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected +++ /dev/null @@ -1,26 +0,0 @@ -0:12(21): preprocessor error: Error: macro foo invoked with 2 arguments (expected 1) - - - - -(two,words) - - - - -(two separate words) - - - -foo(two,words) - - - -((two,words)) - - - -((two,words)) -(((two,words))) - - diff --git a/src/glsl/glcpp/tests/040-token-pasting.c b/src/glsl/glcpp/tests/040-token-pasting.c deleted file mode 100644 index caab3ba7368..00000000000 --- a/src/glsl/glcpp/tests/040-token-pasting.c +++ /dev/null @@ -1,2 +0,0 @@ -#define paste(a,b) a ## b -paste(one , token) diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected b/src/glsl/glcpp/tests/040-token-pasting.c.expected deleted file mode 100644 index 48e836ec3fa..00000000000 --- a/src/glsl/glcpp/tests/040-token-pasting.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -onetoken diff --git a/src/glsl/glcpp/tests/041-if-0.c b/src/glsl/glcpp/tests/041-if-0.c deleted file mode 100644 index 2cab677d3e8..00000000000 --- a/src/glsl/glcpp/tests/041-if-0.c +++ /dev/null @@ -1,5 +0,0 @@ -success_1 -#if 0 -failure -#endif -success_2 diff --git a/src/glsl/glcpp/tests/041-if-0.c.expected b/src/glsl/glcpp/tests/041-if-0.c.expected deleted file mode 100644 index 8b506b32d55..00000000000 --- a/src/glsl/glcpp/tests/041-if-0.c.expected +++ /dev/null @@ -1,5 +0,0 @@ -success_1 - - - -success_2 diff --git a/src/glsl/glcpp/tests/042-if-1.c b/src/glsl/glcpp/tests/042-if-1.c deleted file mode 100644 index 874a25cf41b..00000000000 --- a/src/glsl/glcpp/tests/042-if-1.c +++ /dev/null @@ -1,5 +0,0 @@ -success_1 -#if 1 -success_2 -#endif -success_3 diff --git a/src/glsl/glcpp/tests/042-if-1.c.expected b/src/glsl/glcpp/tests/042-if-1.c.expected deleted file mode 100644 index a6ae9465a97..00000000000 --- a/src/glsl/glcpp/tests/042-if-1.c.expected +++ /dev/null @@ -1,5 +0,0 @@ -success_1 - -success_2 - -success_3 diff --git a/src/glsl/glcpp/tests/043-if-0-else.c b/src/glsl/glcpp/tests/043-if-0-else.c deleted file mode 100644 index 323351f9dbf..00000000000 --- a/src/glsl/glcpp/tests/043-if-0-else.c +++ /dev/null @@ -1,7 +0,0 @@ -success_1 -#if 0 -failure -#else -success_2 -#endif -success_3 diff --git a/src/glsl/glcpp/tests/043-if-0-else.c.expected b/src/glsl/glcpp/tests/043-if-0-else.c.expected deleted file mode 100644 index 3d7e6be96c8..00000000000 --- a/src/glsl/glcpp/tests/043-if-0-else.c.expected +++ /dev/null @@ -1,7 +0,0 @@ -success_1 - - - -success_2 - -success_3 diff --git a/src/glsl/glcpp/tests/044-if-1-else.c b/src/glsl/glcpp/tests/044-if-1-else.c deleted file mode 100644 index 28dfc25c6f0..00000000000 --- a/src/glsl/glcpp/tests/044-if-1-else.c +++ /dev/null @@ -1,7 +0,0 @@ -success_1 -#if 1 -success_2 -#else -failure -#endif -success_3 diff --git a/src/glsl/glcpp/tests/044-if-1-else.c.expected b/src/glsl/glcpp/tests/044-if-1-else.c.expected deleted file mode 100644 index 4a31e1cfa9e..00000000000 --- a/src/glsl/glcpp/tests/044-if-1-else.c.expected +++ /dev/null @@ -1,7 +0,0 @@ -success_1 - -success_2 - - - -success_3 diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c b/src/glsl/glcpp/tests/045-if-0-elif.c deleted file mode 100644 index e50f686d461..00000000000 --- a/src/glsl/glcpp/tests/045-if-0-elif.c +++ /dev/null @@ -1,11 +0,0 @@ -success_1 -#if 0 -failure_1 -#elif 0 -failure_2 -#elif 1 -success_3 -#elif 1 -failure_3 -#endif -success_4 diff --git a/src/glsl/glcpp/tests/045-if-0-elif.c.expected b/src/glsl/glcpp/tests/045-if-0-elif.c.expected deleted file mode 100644 index a9bb1588e4f..00000000000 --- a/src/glsl/glcpp/tests/045-if-0-elif.c.expected +++ /dev/null @@ -1,11 +0,0 @@ -success_1 - - - - - -success_3 - - - -success_4 diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c b/src/glsl/glcpp/tests/046-if-1-elsif.c deleted file mode 100644 index 130515a01ea..00000000000 --- a/src/glsl/glcpp/tests/046-if-1-elsif.c +++ /dev/null @@ -1,11 +0,0 @@ -success_1 -#if 1 -success_2 -#elif 0 -failure_1 -#elif 1 -failure_2 -#elif 0 -failure_3 -#endif -success_3 diff --git a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected b/src/glsl/glcpp/tests/046-if-1-elsif.c.expected deleted file mode 100644 index a4995713ca5..00000000000 --- a/src/glsl/glcpp/tests/046-if-1-elsif.c.expected +++ /dev/null @@ -1,11 +0,0 @@ -success_1 - -success_2 - - - - - - - -success_3 diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c b/src/glsl/glcpp/tests/047-if-elif-else.c deleted file mode 100644 index e8f0838a9ed..00000000000 --- a/src/glsl/glcpp/tests/047-if-elif-else.c +++ /dev/null @@ -1,11 +0,0 @@ -success_1 -#if 0 -failure_1 -#elif 0 -failure_2 -#elif 0 -failure_3 -#else -success_2 -#endif -success_3 diff --git a/src/glsl/glcpp/tests/047-if-elif-else.c.expected b/src/glsl/glcpp/tests/047-if-elif-else.c.expected deleted file mode 100644 index 54d30861197..00000000000 --- a/src/glsl/glcpp/tests/047-if-elif-else.c.expected +++ /dev/null @@ -1,11 +0,0 @@ -success_1 - - - - - - - -success_2 - -success_3 diff --git a/src/glsl/glcpp/tests/048-if-nested.c b/src/glsl/glcpp/tests/048-if-nested.c deleted file mode 100644 index fc4679c3be4..00000000000 --- a/src/glsl/glcpp/tests/048-if-nested.c +++ /dev/null @@ -1,11 +0,0 @@ -success_1 -#if 0 -failure_1 -#if 1 -failure_2 -#else -failure_3 -#endif -failure_4 -#endif -success_2 diff --git a/src/glsl/glcpp/tests/048-if-nested.c.expected b/src/glsl/glcpp/tests/048-if-nested.c.expected deleted file mode 100644 index 8beb9c32c37..00000000000 --- a/src/glsl/glcpp/tests/048-if-nested.c.expected +++ /dev/null @@ -1,11 +0,0 @@ -success_1 - - - - - - - - - -success_2 diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c b/src/glsl/glcpp/tests/049-if-expression-precedence.c deleted file mode 100644 index 833ea03882a..00000000000 --- a/src/glsl/glcpp/tests/049-if-expression-precedence.c +++ /dev/null @@ -1,5 +0,0 @@ -#if 1 + 2 * 3 + - (25 % 17 - + 1) -failure with operator precedence -#else -success -#endif diff --git a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected b/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected deleted file mode 100644 index 729bdd15f80..00000000000 --- a/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - -success - diff --git a/src/glsl/glcpp/tests/050-if-defined.c b/src/glsl/glcpp/tests/050-if-defined.c deleted file mode 100644 index 34f0f95140e..00000000000 --- a/src/glsl/glcpp/tests/050-if-defined.c +++ /dev/null @@ -1,17 +0,0 @@ -#if defined foo -failure_1 -#else -success_1 -#endif -#define foo -#if defined foo -success_2 -#else -failure_2 -#endif -#undef foo -#if defined foo -failure_3 -#else -success_3 -#endif diff --git a/src/glsl/glcpp/tests/050-if-defined.c.expected b/src/glsl/glcpp/tests/050-if-defined.c.expected deleted file mode 100644 index 737eb8d9403..00000000000 --- a/src/glsl/glcpp/tests/050-if-defined.c.expected +++ /dev/null @@ -1,17 +0,0 @@ - - - -success_1 - - - -success_2 - - - - - - - -success_3 - diff --git a/src/glsl/glcpp/tests/051-if-relational.c b/src/glsl/glcpp/tests/051-if-relational.c deleted file mode 100644 index c3db488e0de..00000000000 --- a/src/glsl/glcpp/tests/051-if-relational.c +++ /dev/null @@ -1,35 +0,0 @@ -#if 3 < 2 -failure_1 -#else -success_1 -#endif - -#if 3 >= 2 -success_2 -#else -failure_2 -#endif - -#if 2 + 3 <= 5 -success_3 -#else -failure_3 -#endif - -#if 3 - 2 == 1 -success_3 -#else -failure_3 -#endif - -#if 1 > 3 -failure_4 -#else -success_4 -#endif - -#if 1 != 5 -success_5 -#else -failure_5 -#endif diff --git a/src/glsl/glcpp/tests/051-if-relational.c.expected b/src/glsl/glcpp/tests/051-if-relational.c.expected deleted file mode 100644 index 652fefdd43b..00000000000 --- a/src/glsl/glcpp/tests/051-if-relational.c.expected +++ /dev/null @@ -1,35 +0,0 @@ - - - -success_1 - - - -success_2 - - - - - -success_3 - - - - - -success_3 - - - - - - - -success_4 - - - -success_5 - - - diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c b/src/glsl/glcpp/tests/052-if-bitwise.c deleted file mode 100644 index 2d8e45eb61e..00000000000 --- a/src/glsl/glcpp/tests/052-if-bitwise.c +++ /dev/null @@ -1,20 +0,0 @@ -#if (0xaaaaaaaa | 0x55555555) != 4294967295 -failure_1 -#else -success_1 -#endif -#if (0x12345678 ^ 0xfdecba98) == 4023971040 -success_2 -#else -failure_2 -#endif -#if (~ 0xdeadbeef) != -3735928560 -failure_3 -#else -success_3 -#endif -#if (0667 & 0733) == 403 -success_4 -#else -failure_4 -#endif diff --git a/src/glsl/glcpp/tests/052-if-bitwise.c.expected b/src/glsl/glcpp/tests/052-if-bitwise.c.expected deleted file mode 100644 index 44e52b206e5..00000000000 --- a/src/glsl/glcpp/tests/052-if-bitwise.c.expected +++ /dev/null @@ -1,20 +0,0 @@ - - - -success_1 - - -success_2 - - - - - - -success_3 - - -success_4 - - - diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c b/src/glsl/glcpp/tests/053-if-divide-and-shift.c deleted file mode 100644 index d24c54a88d1..00000000000 --- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c +++ /dev/null @@ -1,15 +0,0 @@ -#if (15 / 2) != 7 -failure_1 -#else -success_1 -#endif -#if (1 << 12) == 4096 -success_2 -#else -failure_2 -#endif -#if (31762 >> 8) != 124 -failure_3 -#else -success_3 -#endif diff --git a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected b/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected deleted file mode 100644 index 7e78e0454e0..00000000000 --- a/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected +++ /dev/null @@ -1,15 +0,0 @@ - - - -success_1 - - -success_2 - - - - - - -success_3 - diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c b/src/glsl/glcpp/tests/054-if-with-macros.c deleted file mode 100644 index 3da79a0d96e..00000000000 --- a/src/glsl/glcpp/tests/054-if-with-macros.c +++ /dev/null @@ -1,34 +0,0 @@ -#define one 1 -#define two 2 -#define three 3 -#define five 5 -#if five < two -failure_1 -#else -success_1 -#endif -#if three >= two -success_2 -#else -failure_2 -#endif -#if two + three <= five -success_3 -#else -failure_3 -#endif -#if five - two == three -success_4 -#else -failure_4 -#endif -#if one > three -failure_5 -#else -success_5 -#endif -#if one != five -success_6 -#else -failure_6 -#endif diff --git a/src/glsl/glcpp/tests/054-if-with-macros.c.expected b/src/glsl/glcpp/tests/054-if-with-macros.c.expected deleted file mode 100644 index 70f737c90a9..00000000000 --- a/src/glsl/glcpp/tests/054-if-with-macros.c.expected +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - -success_1 - - -success_2 - - - - -success_3 - - - - -success_4 - - - - - - -success_5 - - -success_6 - - - diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c deleted file mode 100644 index 00f2c2346d6..00000000000 --- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c +++ /dev/null @@ -1,3 +0,0 @@ -#define failure() success -#define foo failure -foo() diff --git a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected deleted file mode 100644 index 94c15f95059..00000000000 --- a/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -success diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c deleted file mode 100644 index 58701d1f25b..00000000000 --- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c +++ /dev/null @@ -1,4 +0,0 @@ -#define bar with,embedded,commas -#define function(x) success -#define foo function -foo(bar) diff --git a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected deleted file mode 100644 index bed826e7831..00000000000 --- a/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - - -success diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c b/src/glsl/glcpp/tests/057-empty-arguments.c deleted file mode 100644 index 6140232865d..00000000000 --- a/src/glsl/glcpp/tests/057-empty-arguments.c +++ /dev/null @@ -1,6 +0,0 @@ -#define zero() success -zero() -#define one(x) success -one() -#define two(x,y) success -two(,) diff --git a/src/glsl/glcpp/tests/057-empty-arguments.c.expected b/src/glsl/glcpp/tests/057-empty-arguments.c.expected deleted file mode 100644 index 7d97e15e29d..00000000000 --- a/src/glsl/glcpp/tests/057-empty-arguments.c.expected +++ /dev/null @@ -1,6 +0,0 @@ - -success - -success - -success diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c deleted file mode 100644 index 8ac260c76b6..00000000000 --- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c +++ /dev/null @@ -1,5 +0,0 @@ -#define paste(x,y) x ## y -paste(a,b) -paste(a,) -paste(,b) -paste(,) diff --git a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected deleted file mode 100644 index e0967a1b951..00000000000 --- a/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - -ab -a -b - diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c b/src/glsl/glcpp/tests/059-token-pasting-integer.c deleted file mode 100644 index 37b895a4237..00000000000 --- a/src/glsl/glcpp/tests/059-token-pasting-integer.c +++ /dev/null @@ -1,4 +0,0 @@ -#define paste(x,y) x ## y -paste(1,2) -paste(1,000) -paste(identifier,2) diff --git a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected b/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected deleted file mode 100644 index f1288aa7cb7..00000000000 --- a/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - -12 -1000 -identifier2 diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c deleted file mode 100644 index ed80ea879ce..00000000000 --- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c +++ /dev/null @@ -1,3 +0,0 @@ -#define double(a) a*2 -#define foo double( -foo 5) diff --git a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected deleted file mode 100644 index 3e5501aa6e8..00000000000 --- a/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -5*2 diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c deleted file mode 100644 index 6dbfd1f62d1..00000000000 --- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c +++ /dev/null @@ -1,5 +0,0 @@ -#define foo(x) success -#define bar foo -#define baz bar -#define joe baz -joe (failure) diff --git a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected deleted file mode 100644 index 15eb64b97f1..00000000000 --- a/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - - -success diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c deleted file mode 100644 index d9e439bb890..00000000000 --- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c +++ /dev/null @@ -1,5 +0,0 @@ -#define foo(a,b) -#if 0 -foo(bar) -foo( -#endif diff --git a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected deleted file mode 100644 index 3f2ff2d6cc8..00000000000 --- a/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/glsl/glcpp/tests/063-comments.c b/src/glsl/glcpp/tests/063-comments.c deleted file mode 100644 index e641d2f0f9e..00000000000 --- a/src/glsl/glcpp/tests/063-comments.c +++ /dev/null @@ -1,20 +0,0 @@ -/* this is a comment */ -// so is this -// */ -f = g/**//h; -/*//*/l(); -m = n//**/o -+ p; -/* this -comment spans -multiple lines and -contains *** stars -and slashes / *** / -and other stuff. -****/ -more code here -/* Test that /* nested - comments */ -are not treated like comments. -/*/ this is a comment */ -/*/*/ diff --git a/src/glsl/glcpp/tests/063-comments.c.expected b/src/glsl/glcpp/tests/063-comments.c.expected deleted file mode 100644 index f6e10ce0377..00000000000 --- a/src/glsl/glcpp/tests/063-comments.c.expected +++ /dev/null @@ -1,20 +0,0 @@ - - - -f = g /h; - l(); -m = n -+ p; - - - - - - - -more code here - - -are not treated like comments. - - diff --git a/src/glsl/glcpp/tests/064-version.c b/src/glsl/glcpp/tests/064-version.c deleted file mode 100644 index 21326481b87..00000000000 --- a/src/glsl/glcpp/tests/064-version.c +++ /dev/null @@ -1,2 +0,0 @@ -#version 130 -#define FOO diff --git a/src/glsl/glcpp/tests/064-version.c.expected b/src/glsl/glcpp/tests/064-version.c.expected deleted file mode 100644 index 4036b1ee374..00000000000 --- a/src/glsl/glcpp/tests/064-version.c.expected +++ /dev/null @@ -1,2 +0,0 @@ -#version 130 - diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c b/src/glsl/glcpp/tests/065-if-defined-parens.c deleted file mode 100644 index 48aa0f8c3ef..00000000000 --- a/src/glsl/glcpp/tests/065-if-defined-parens.c +++ /dev/null @@ -1,17 +0,0 @@ -#if defined(foo) -failure_1 -#else -success_1 -#endif -#define foo -#if defined ( foo ) -success_2 -#else -failure_2 -#endif -#undef foo -#if defined (foo) -failure_3 -#else -success_3 -#endif diff --git a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected b/src/glsl/glcpp/tests/065-if-defined-parens.c.expected deleted file mode 100644 index 737eb8d9403..00000000000 --- a/src/glsl/glcpp/tests/065-if-defined-parens.c.expected +++ /dev/null @@ -1,17 +0,0 @@ - - - -success_1 - - - -success_2 - - - - - - - -success_3 - diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c b/src/glsl/glcpp/tests/066-if-nospace-expression.c deleted file mode 100644 index 3b0b47349d0..00000000000 --- a/src/glsl/glcpp/tests/066-if-nospace-expression.c +++ /dev/null @@ -1,3 +0,0 @@ -#if(1) -success -#endif diff --git a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected b/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected deleted file mode 100644 index 5a28fb3b66c..00000000000 --- a/src/glsl/glcpp/tests/066-if-nospace-expression.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - -success - diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c b/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c deleted file mode 100644 index f46cce4e60a..00000000000 --- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c +++ /dev/null @@ -1,40 +0,0 @@ -#define D1 -#define D2 - -#define result success - -#ifdef U1 -#ifdef U2 -#undef result -#define result failure -#endif -#endif -result - -#ifndef D1 -#ifndef D2 -#undef result -#define result failure -#endif -#endif -result - -#undef result -#define result failure -#ifdef D1 -#ifdef D2 -#undef result -#define result success -#endif -#endif -result - -#undef result -#define result failure -#ifndef U1 -#ifndef U2 -#undef result -#define result success -#endif -#endif -result diff --git a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected b/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected deleted file mode 100644 index 9a5ed2eb2d3..00000000000 --- a/src/glsl/glcpp/tests/067-nested-ifdef-ifndef.c.expected +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - -success - - - - - - - -success - - - - - - - - - -success - - - - - - - - - -success diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c b/src/glsl/glcpp/tests/068-accidental-pasting.c deleted file mode 100644 index 699ac5144e5..00000000000 --- a/src/glsl/glcpp/tests/068-accidental-pasting.c +++ /dev/null @@ -1,11 +0,0 @@ -#define empty -<empty< -<empty= ->empty> ->empty= -=empty= -!empty= -&empty& -|empty| -+empty+ --empty- diff --git a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected b/src/glsl/glcpp/tests/068-accidental-pasting.c.expected deleted file mode 100644 index 27582cda5e8..00000000000 --- a/src/glsl/glcpp/tests/068-accidental-pasting.c.expected +++ /dev/null @@ -1,11 +0,0 @@ - -< < -< = -> > -> = -= = -! = -& & -| | -+ + -- - diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c b/src/glsl/glcpp/tests/069-repeated-argument.c deleted file mode 100644 index 2b46ead294c..00000000000 --- a/src/glsl/glcpp/tests/069-repeated-argument.c +++ /dev/null @@ -1,2 +0,0 @@ -#define double(x) x x -double(1) diff --git a/src/glsl/glcpp/tests/069-repeated-argument.c.expected b/src/glsl/glcpp/tests/069-repeated-argument.c.expected deleted file mode 100644 index 8b4b095e488..00000000000 --- a/src/glsl/glcpp/tests/069-repeated-argument.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -1 1 diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c b/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c deleted file mode 100644 index d15a4840b01..00000000000 --- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c +++ /dev/null @@ -1,5 +0,0 @@ -#if UNDEFINED_MACRO -Failure -#else -Success -#endif diff --git a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected b/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected deleted file mode 100644 index 44b93a434fa..00000000000 --- a/src/glsl/glcpp/tests/070-undefined-macro-in-expression.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - -Success - diff --git a/src/glsl/glcpp/tests/071-punctuator.c b/src/glsl/glcpp/tests/071-punctuator.c deleted file mode 100644 index 959d6825988..00000000000 --- a/src/glsl/glcpp/tests/071-punctuator.c +++ /dev/null @@ -1 +0,0 @@ -a = b diff --git a/src/glsl/glcpp/tests/071-punctuator.c.expected b/src/glsl/glcpp/tests/071-punctuator.c.expected deleted file mode 100644 index 959d6825988..00000000000 --- a/src/glsl/glcpp/tests/071-punctuator.c.expected +++ /dev/null @@ -1 +0,0 @@ -a = b diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c b/src/glsl/glcpp/tests/072-token-pasting-same-line.c deleted file mode 100644 index e421e9d5e29..00000000000 --- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c +++ /dev/null @@ -1,2 +0,0 @@ -#define paste(x) success_ ## x -paste(1) paste(2) paste(3) diff --git a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected b/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected deleted file mode 100644 index 7b80af7e465..00000000000 --- a/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -success_1 success_2 success_3 diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c b/src/glsl/glcpp/tests/073-if-in-ifdef.c deleted file mode 100644 index 61a48097ca3..00000000000 --- a/src/glsl/glcpp/tests/073-if-in-ifdef.c +++ /dev/null @@ -1,4 +0,0 @@ -#ifdef UNDEF -#if UNDEF > 1 -#endif -#endif diff --git a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected b/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected deleted file mode 100644 index fd40910d9e7..00000000000 --- a/src/glsl/glcpp/tests/073-if-in-ifdef.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/glsl/glcpp/tests/074-elif-undef.c b/src/glsl/glcpp/tests/074-elif-undef.c deleted file mode 100644 index 67aac8977e0..00000000000 --- a/src/glsl/glcpp/tests/074-elif-undef.c +++ /dev/null @@ -1,3 +0,0 @@ -#ifndef UNDEF -#elif UNDEF < 0 -#endif diff --git a/src/glsl/glcpp/tests/074-elif-undef.c.expected b/src/glsl/glcpp/tests/074-elif-undef.c.expected deleted file mode 100644 index b28b04f6431..00000000000 --- a/src/glsl/glcpp/tests/074-elif-undef.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c b/src/glsl/glcpp/tests/075-elif-elif-undef.c deleted file mode 100644 index 264bc4f10ee..00000000000 --- a/src/glsl/glcpp/tests/075-elif-elif-undef.c +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef UNDEF -#elif UNDEF < 0 -#elif UNDEF == 3 -#endif diff --git a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected b/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected deleted file mode 100644 index fd40910d9e7..00000000000 --- a/src/glsl/glcpp/tests/075-elif-elif-undef.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c b/src/glsl/glcpp/tests/076-elif-undef-nested.c deleted file mode 100644 index ebd550ed005..00000000000 --- a/src/glsl/glcpp/tests/076-elif-undef-nested.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef UNDEF -#if UNDEF == 4 -#elif UNDEF == 5 -#endif -#endif diff --git a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected b/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected deleted file mode 100644 index 3f2ff2d6cc8..00000000000 --- a/src/glsl/glcpp/tests/076-elif-undef-nested.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/glsl/glcpp/tests/077-else-without-if.c b/src/glsl/glcpp/tests/077-else-without-if.c deleted file mode 100644 index 81f00bfe278..00000000000 --- a/src/glsl/glcpp/tests/077-else-without-if.c +++ /dev/null @@ -1 +0,0 @@ -#else diff --git a/src/glsl/glcpp/tests/077-else-without-if.c.expected b/src/glsl/glcpp/tests/077-else-without-if.c.expected deleted file mode 100644 index 69f34047033..00000000000 --- a/src/glsl/glcpp/tests/077-else-without-if.c.expected +++ /dev/null @@ -1,3 +0,0 @@ -0:1(1): preprocessor error: #else without #if - - diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c b/src/glsl/glcpp/tests/078-elif-without-if.c deleted file mode 100644 index 60466b3890a..00000000000 --- a/src/glsl/glcpp/tests/078-elif-without-if.c +++ /dev/null @@ -1 +0,0 @@ -#elif defined FOO diff --git a/src/glsl/glcpp/tests/078-elif-without-if.c.expected b/src/glsl/glcpp/tests/078-elif-without-if.c.expected deleted file mode 100644 index b8e40ecc09b..00000000000 --- a/src/glsl/glcpp/tests/078-elif-without-if.c.expected +++ /dev/null @@ -1,3 +0,0 @@ -0:1(1): preprocessor error: #elif without #if - - diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c b/src/glsl/glcpp/tests/079-endif-without-if.c deleted file mode 100644 index 69331c3ca9d..00000000000 --- a/src/glsl/glcpp/tests/079-endif-without-if.c +++ /dev/null @@ -1 +0,0 @@ -#endif diff --git a/src/glsl/glcpp/tests/079-endif-without-if.c.expected b/src/glsl/glcpp/tests/079-endif-without-if.c.expected deleted file mode 100644 index 7ae579dd25e..00000000000 --- a/src/glsl/glcpp/tests/079-endif-without-if.c.expected +++ /dev/null @@ -1,3 +0,0 @@ -0:1(1): preprocessor error: #endif without #if - - diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c b/src/glsl/glcpp/tests/080-if-without-expression.c deleted file mode 100644 index a27ba36a366..00000000000 --- a/src/glsl/glcpp/tests/080-if-without-expression.c +++ /dev/null @@ -1,4 +0,0 @@ -/* Error message for unskipped #if with no expression. */ -#if -#endif - diff --git a/src/glsl/glcpp/tests/080-if-without-expression.c.expected b/src/glsl/glcpp/tests/080-if-without-expression.c.expected deleted file mode 100644 index 2e4cd7323c5..00000000000 --- a/src/glsl/glcpp/tests/080-if-without-expression.c.expected +++ /dev/null @@ -1,5 +0,0 @@ -0:2(1): preprocessor error: #if with no expression - - - - diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c b/src/glsl/glcpp/tests/081-elif-without-expression.c deleted file mode 100644 index 79c78663dd3..00000000000 --- a/src/glsl/glcpp/tests/081-elif-without-expression.c +++ /dev/null @@ -1,3 +0,0 @@ -#if 0 -#elif -#endif diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/src/glsl/glcpp/tests/081-elif-without-expression.c.expected deleted file mode 100644 index b607b849068..00000000000 --- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected +++ /dev/null @@ -1,4 +0,0 @@ -0:2(1): preprocessor error: #elif with no expression - - - diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c b/src/glsl/glcpp/tests/082-invalid-paste.c deleted file mode 100644 index 8b84d50c3a0..00000000000 --- a/src/glsl/glcpp/tests/082-invalid-paste.c +++ /dev/null @@ -1,7 +0,0 @@ -#define PASTE(x,y) x ## y -PASTE(<,>) -PASTE(0,abc) -PASTE(1,=) -PASTE(2,@) -PASTE(3,-4) -PASTE(4,+5.2) diff --git a/src/glsl/glcpp/tests/082-invalid-paste.c.expected b/src/glsl/glcpp/tests/082-invalid-paste.c.expected deleted file mode 100644 index b48a2d6d296..00000000000 --- a/src/glsl/glcpp/tests/082-invalid-paste.c.expected +++ /dev/null @@ -1,19 +0,0 @@ -0:2(7): preprocessor error: -Pasting "<" and ">" does not give a valid preprocessing token. -0:3(7): preprocessor error: -Pasting "0" and "abc" does not give a valid preprocessing token. -0:4(7): preprocessor error: -Pasting "1" and "=" does not give a valid preprocessing token. -0:5(7): preprocessor error: -Pasting "2" and "@" does not give a valid preprocessing token. -0:6(7): preprocessor error: -Pasting "3" and "-" does not give a valid preprocessing token. -0:7(7): preprocessor error: -Pasting "4" and "+" does not give a valid preprocessing token. - -< -0 -1 -2 -34 -45.2 diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c b/src/glsl/glcpp/tests/083-unterminated-if.c deleted file mode 100644 index 91806350927..00000000000 --- a/src/glsl/glcpp/tests/083-unterminated-if.c +++ /dev/null @@ -1,2 +0,0 @@ -#if 1 - diff --git a/src/glsl/glcpp/tests/083-unterminated-if.c.expected b/src/glsl/glcpp/tests/083-unterminated-if.c.expected deleted file mode 100644 index 4659ab6fe67..00000000000 --- a/src/glsl/glcpp/tests/083-unterminated-if.c.expected +++ /dev/null @@ -1,4 +0,0 @@ -0:1(6): preprocessor error: Unterminated #if - - - diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c b/src/glsl/glcpp/tests/084-unbalanced-parentheses.c deleted file mode 100644 index 0789ba5e525..00000000000 --- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c +++ /dev/null @@ -1,2 +0,0 @@ -#define FUNC(x) (2*(x)) -FUNC(23 diff --git a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected b/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected deleted file mode 100644 index af49a37369d..00000000000 --- a/src/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected +++ /dev/null @@ -1,2 +0,0 @@ -0:2(8): preprocessor error: syntax error, unexpected $end - diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c b/src/glsl/glcpp/tests/085-incorrect-argument-count.c deleted file mode 100644 index 91bea600612..00000000000 --- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c +++ /dev/null @@ -1,5 +0,0 @@ -#define MULT(x,y) ((x)*(y)) -MULT() -MULT(1) -MULT(1,2,3) - diff --git a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected b/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected deleted file mode 100644 index d23845bfd49..00000000000 --- a/src/glsl/glcpp/tests/085-incorrect-argument-count.c.expected +++ /dev/null @@ -1,11 +0,0 @@ -0:2(1): preprocessor error: Error: macro MULT invoked with 1 arguments (expected 2) - -0:3(1): preprocessor error: Error: macro MULT invoked with 1 arguments (expected 2) - -0:4(1): preprocessor error: Error: macro MULT invoked with 3 arguments (expected 2) - - -MULT() -MULT(1) -MULT(1,2,3) - diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c b/src/glsl/glcpp/tests/086-reserved-macro-names.c deleted file mode 100644 index a6b7201f95d..00000000000 --- a/src/glsl/glcpp/tests/086-reserved-macro-names.c +++ /dev/null @@ -1,3 +0,0 @@ -#define __BAD reserved -#define GL_ALSO_BAD() also reserved -#define THIS__TOO__IS__BAD reserved diff --git a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected b/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected deleted file mode 100644 index 38b089daec3..00000000000 --- a/src/glsl/glcpp/tests/086-reserved-macro-names.c.expected +++ /dev/null @@ -1,9 +0,0 @@ -0:1(9): preprocessor warning: Macro names containing "__" are reserved for use by the implementation. - -0:2(9): preprocessor error: Macro names starting with "GL_" are reserved. - -0:3(9): preprocessor warning: Macro names containing "__" are reserved for use by the implementation. - - - - diff --git a/src/glsl/glcpp/tests/087-if-comments.c b/src/glsl/glcpp/tests/087-if-comments.c deleted file mode 100644 index ce8dc43057f..00000000000 --- a/src/glsl/glcpp/tests/087-if-comments.c +++ /dev/null @@ -1,5 +0,0 @@ -#if (1 == 0) // dangerous comment -fail -#else -win -#endif diff --git a/src/glsl/glcpp/tests/087-if-comments.c.expected b/src/glsl/glcpp/tests/087-if-comments.c.expected deleted file mode 100644 index 2783a9c14d5..00000000000 --- a/src/glsl/glcpp/tests/087-if-comments.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - -win - diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c b/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c deleted file mode 100644 index 422c6546414..00000000000 --- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c +++ /dev/null @@ -1,5 +0,0 @@ -#define abc 123 -#define abc 123 - -#define foo(x) ( x ) + 23 -#define foo(x) ( x ) + 23 diff --git a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected b/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected deleted file mode 100644 index 3f2ff2d6cc8..00000000000 --- a/src/glsl/glcpp/tests/088-redefine-macro-legitimate.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c b/src/glsl/glcpp/tests/089-redefine-macro-error.c deleted file mode 100644 index b3d1391e160..00000000000 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c +++ /dev/null @@ -1,17 +0,0 @@ -#define x y -#define x z - -#define abc 123 -#define abc() 123 - -#define foo() bar -#define foo(x) bar - -#define bar() baz -#define bar baz - -#define biff(a,b) a+b -#define biff(a,b,c) a+b - -#define oper(a,b) a+b -#define oper(a,b) a*b diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected deleted file mode 100644 index a945161497f..00000000000 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected +++ /dev/null @@ -1,29 +0,0 @@ -0:2(9): preprocessor error: Redefinition of macro x - -0:5(9): preprocessor error: Redefinition of macro abc - -0:8(9): preprocessor error: Redefinition of macro foo - -0:11(9): preprocessor error: Redefinition of macro bar - -0:14(9): preprocessor error: Redefinition of macro biff - -0:17(9): preprocessor error: Redefinition of macro oper - - - - - - - - - - - - - - - - - - diff --git a/src/glsl/glcpp/tests/090-hash-error.c b/src/glsl/glcpp/tests/090-hash-error.c deleted file mode 100644 index d19bb7faed8..00000000000 --- a/src/glsl/glcpp/tests/090-hash-error.c +++ /dev/null @@ -1 +0,0 @@ -#error human error diff --git a/src/glsl/glcpp/tests/090-hash-error.c.expected b/src/glsl/glcpp/tests/090-hash-error.c.expected deleted file mode 100644 index 876a6ea9cc5..00000000000 --- a/src/glsl/glcpp/tests/090-hash-error.c.expected +++ /dev/null @@ -1 +0,0 @@ -0:1(1): preprocessor error: #error human error diff --git a/src/glsl/glcpp/tests/091-hash-line.c b/src/glsl/glcpp/tests/091-hash-line.c deleted file mode 100644 index 26d70382a89..00000000000 --- a/src/glsl/glcpp/tests/091-hash-line.c +++ /dev/null @@ -1,14 +0,0 @@ -#line 0 -#error line 0 error -#line 25 -#error line 25 error -#line 0 1 -#error source 1, line 0 error -#line 30 2 -#error source 2, line 30 error -#line 45 2 /* A line with a comment */ -#define NINETY 90 -#define TWO 2 -#line NINETY TWO /* A #line line with macro expansion */ -#define FUNCTION_LIKE_MACRO(source, line) source line -#line FUNCTION_LIKE_MACRO(180,2) diff --git a/src/glsl/glcpp/tests/091-hash-line.c.expected b/src/glsl/glcpp/tests/091-hash-line.c.expected deleted file mode 100644 index ac9ab252f1e..00000000000 --- a/src/glsl/glcpp/tests/091-hash-line.c.expected +++ /dev/null @@ -1,14 +0,0 @@ -0:0(1): preprocessor error: #error line 0 error -0:25(1): preprocessor error: #error line 25 error -1:0(1): preprocessor error: #error source 1, line 0 error -2:30(1): preprocessor error: #error source 2, line 30 error -#line 0 -#line 25 -#line 0 1 -#line 30 2 -#line 45 2 - - -#line 90 2 - -#line 180 2 diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c b/src/glsl/glcpp/tests/092-redefine-macro-error-2.c deleted file mode 100644 index 3c161a5c501..00000000000 --- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c +++ /dev/null @@ -1,5 +0,0 @@ -#define A -#define A 1 - -#define B 1 -#define B diff --git a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected b/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected deleted file mode 100644 index 698294d91f2..00000000000 --- a/src/glsl/glcpp/tests/092-redefine-macro-error-2.c.expected +++ /dev/null @@ -1,9 +0,0 @@ -0:2(9): preprocessor error: Redefinition of macro A - -0:5(9): preprocessor error: Redefinition of macro B - - - - - - diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c b/src/glsl/glcpp/tests/093-divide-by-zero.c deleted file mode 100644 index bf65d4f5271..00000000000 --- a/src/glsl/glcpp/tests/093-divide-by-zero.c +++ /dev/null @@ -1,2 +0,0 @@ -#if (1 / 0) -#endif diff --git a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected b/src/glsl/glcpp/tests/093-divide-by-zero.c.expected deleted file mode 100644 index a858870b794..00000000000 --- a/src/glsl/glcpp/tests/093-divide-by-zero.c.expected +++ /dev/null @@ -1,3 +0,0 @@ -0:1(12): preprocessor error: division by 0 in preprocessor directive - - diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c b/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c deleted file mode 100644 index 04497b17913..00000000000 --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c +++ /dev/null @@ -1,13 +0,0 @@ -/* glcpp is generating a division-by-zero error for this case. It's - * easy to argue that it should be short-circuiting the evaluation and - * not generating the diagnostic (which happens to be what gcc does). - * But it doesn't seem like we should force this behavior on our - * pre-processor, (and, as always, the GLSL specification of the - * pre-processor is too vague on this point). - * - * If a short-circuit evaluation optimization does get added to the - * pre-processor then it would legitimate to update the expected file - * for this test. -*/ -#if 1 || (1 / 0) -#endif diff --git a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected deleted file mode 100644 index 570952b2454..00000000000 --- a/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected +++ /dev/null @@ -1,14 +0,0 @@ -0:12(17): preprocessor error: division by 0 in preprocessor directive - - - - - - - - - - - - - diff --git a/src/glsl/glcpp/tests/095-recursive-define.c b/src/glsl/glcpp/tests/095-recursive-define.c deleted file mode 100644 index 801d90ce2e3..00000000000 --- a/src/glsl/glcpp/tests/095-recursive-define.c +++ /dev/null @@ -1,3 +0,0 @@ -#define A(a, b) B(a, b) -#define C A(0, C) -C diff --git a/src/glsl/glcpp/tests/095-recursive-define.c.expected b/src/glsl/glcpp/tests/095-recursive-define.c.expected deleted file mode 100644 index 493ab091be7..00000000000 --- a/src/glsl/glcpp/tests/095-recursive-define.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - -B(0, C) diff --git a/src/glsl/glcpp/tests/096-paste-twice.c b/src/glsl/glcpp/tests/096-paste-twice.c deleted file mode 100644 index 8da756fcba4..00000000000 --- a/src/glsl/glcpp/tests/096-paste-twice.c +++ /dev/null @@ -1,3 +0,0 @@ -#define paste_twice(a,b,c) a ## b ## c -paste_twice(just, one, token) - diff --git a/src/glsl/glcpp/tests/096-paste-twice.c.expected b/src/glsl/glcpp/tests/096-paste-twice.c.expected deleted file mode 100644 index 96c57d2a6ec..00000000000 --- a/src/glsl/glcpp/tests/096-paste-twice.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - -justonetoken - diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c deleted file mode 100644 index 0f46835c29e..00000000000 --- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c +++ /dev/null @@ -1,3 +0,0 @@ -#define PASTE_MACRO one ## token -PASTE_MACRO - diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected deleted file mode 100644 index 36f66992539..00000000000 --- a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - -onetoken - diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c b/src/glsl/glcpp/tests/098-elif-undefined.c deleted file mode 100644 index 1f520d4d432..00000000000 --- a/src/glsl/glcpp/tests/098-elif-undefined.c +++ /dev/null @@ -1,7 +0,0 @@ -#if 0 -Not this -#elif UNDEFINED_MACRO -Nor this -#else -Yes, this. -#endif diff --git a/src/glsl/glcpp/tests/098-elif-undefined.c.expected b/src/glsl/glcpp/tests/098-elif-undefined.c.expected deleted file mode 100644 index c6ef689ce4b..00000000000 --- a/src/glsl/glcpp/tests/098-elif-undefined.c.expected +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -Yes, this. - diff --git a/src/glsl/glcpp/tests/099-c99-example.c b/src/glsl/glcpp/tests/099-c99-example.c deleted file mode 100644 index d1976b1f265..00000000000 --- a/src/glsl/glcpp/tests/099-c99-example.c +++ /dev/null @@ -1,17 +0,0 @@ -#define x 3 -#define f(a) f(x * (a)) -#undef x -#define x 2 -#define g f -#define z z[0] -#define h g(~ -#define m(a) a(w) -#define w 0,1 -#define t(a) a -#define p() int -#define q(x) x -#define r(x,y) x ## y -f(y+1) + f(f(z)) % t(t(g)(0) + t)(1); -g(x +(3,4)-w) | h 5) & m - (f)^m(m); -p() i[q()] = { q(1), r(2,3), r(4,), r(,5), r(,)}; diff --git a/src/glsl/glcpp/tests/099-c99-example.c.expected b/src/glsl/glcpp/tests/099-c99-example.c.expected deleted file mode 100644 index 352bbff48f5..00000000000 --- a/src/glsl/glcpp/tests/099-c99-example.c.expected +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - -f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1); -f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1); -int i[] = { 1, 23, 4, 5, }; diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c b/src/glsl/glcpp/tests/100-macro-with-colon.c deleted file mode 100644 index 31dbb9a9edc..00000000000 --- a/src/glsl/glcpp/tests/100-macro-with-colon.c +++ /dev/null @@ -1,7 +0,0 @@ -#define one 1 -#define two 2 - -switch (1) { - case one + two: - break; -} diff --git a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected b/src/glsl/glcpp/tests/100-macro-with-colon.c.expected deleted file mode 100644 index 09f1f417bdd..00000000000 --- a/src/glsl/glcpp/tests/100-macro-with-colon.c.expected +++ /dev/null @@ -1,7 +0,0 @@ - - - -switch (1) { - case 1 + 2: - break; -} diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c b/src/glsl/glcpp/tests/101-macros-used-twice.c deleted file mode 100644 index e1693805b6a..00000000000 --- a/src/glsl/glcpp/tests/101-macros-used-twice.c +++ /dev/null @@ -1,16 +0,0 @@ -#define object 1 -#define function(x) 1 - -#if object -once -#endif -#if object -twice -#endif - -#if function(0) -once -#endif -#if function(0) -once again -#endif diff --git a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected b/src/glsl/glcpp/tests/101-macros-used-twice.c.expected deleted file mode 100644 index 1e0b30696cb..00000000000 --- a/src/glsl/glcpp/tests/101-macros-used-twice.c.expected +++ /dev/null @@ -1,16 +0,0 @@ - - - - -once - - -twice - - - -once - - -once again - diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c b/src/glsl/glcpp/tests/102-garbage-after-endif.c deleted file mode 100644 index 301779eb948..00000000000 --- a/src/glsl/glcpp/tests/102-garbage-after-endif.c +++ /dev/null @@ -1,2 +0,0 @@ -#if 0 -#endif garbage diff --git a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected b/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected deleted file mode 100644 index d9f3bdc9465..00000000000 --- a/src/glsl/glcpp/tests/102-garbage-after-endif.c.expected +++ /dev/null @@ -1,2 +0,0 @@ -0:2(8): preprocessor error: syntax error, unexpected IDENTIFIER, expecting NEWLINE - diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c b/src/glsl/glcpp/tests/103-garbage-after-else-0.c deleted file mode 100644 index c460feadf57..00000000000 --- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c +++ /dev/null @@ -1,3 +0,0 @@ -#if 0 -#else garbage -#endif diff --git a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected b/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected deleted file mode 100644 index b053b399775..00000000000 --- a/src/glsl/glcpp/tests/103-garbage-after-else-0.c.expected +++ /dev/null @@ -1,4 +0,0 @@ -0:2(7): preprocessor error: syntax error, unexpected IDENTIFIER, expecting NEWLINE -0:1(6): preprocessor error: Unterminated #if - - diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c b/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c deleted file mode 100644 index 3fbeec48e4c..00000000000 --- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c +++ /dev/null @@ -1,2 +0,0 @@ -#line 2 -int foo(); diff --git a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected b/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected deleted file mode 100644 index 3fbeec48e4c..00000000000 --- a/src/glsl/glcpp/tests/104-hash-line-followed-by-code.c.expected +++ /dev/null @@ -1,2 +0,0 @@ -#line 2 -int foo(); diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c b/src/glsl/glcpp/tests/105-multiline-hash-line.c deleted file mode 100644 index da156c6a596..00000000000 --- a/src/glsl/glcpp/tests/105-multiline-hash-line.c +++ /dev/null @@ -1,5 +0,0 @@ -#define X(x) x -#line X( \ - 1 \ - ) -#line 2 diff --git a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected b/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected deleted file mode 100644 index 814cef1b8c5..00000000000 --- a/src/glsl/glcpp/tests/105-multiline-hash-line.c.expected +++ /dev/null @@ -1,5 +0,0 @@ - -#line 1 - - -#line 2 diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c b/src/glsl/glcpp/tests/106-multiline-hash-if.c deleted file mode 100644 index 929e93e782f..00000000000 --- a/src/glsl/glcpp/tests/106-multiline-hash-if.c +++ /dev/null @@ -1,6 +0,0 @@ -#define X(x) x -#if X( \ - 1 \ - ) -int foo(); -#endif diff --git a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected b/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected deleted file mode 100644 index 1c0cbc970f5..00000000000 --- a/src/glsl/glcpp/tests/106-multiline-hash-if.c.expected +++ /dev/null @@ -1,6 +0,0 @@ - - - - -int foo(); - diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c b/src/glsl/glcpp/tests/107-multiline-hash-elif.c deleted file mode 100644 index 8c1c67a4d6b..00000000000 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c +++ /dev/null @@ -1,7 +0,0 @@ -#define X(x) x -#if 0 -#elif X( \ - 1 \ - ) -int foo(); -#endif diff --git a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected b/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected deleted file mode 100644 index b0601d7ee42..00000000000 --- a/src/glsl/glcpp/tests/107-multiline-hash-elif.c.expected +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -int foo(); - diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c deleted file mode 100644 index 0ce36f2eb1b..00000000000 --- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c +++ /dev/null @@ -1 +0,0 @@ -#version110 diff --git a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected b/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected deleted file mode 100644 index 4f4243f947f..00000000000 --- a/src/glsl/glcpp/tests/108-no-space-after-hash-version.c.expected +++ /dev/null @@ -1 +0,0 @@ -0:1(1): preprocessor error: Illegal non-directive after # diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c deleted file mode 100644 index f52966a8e80..00000000000 --- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c +++ /dev/null @@ -1 +0,0 @@ -#line2 diff --git a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected b/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected deleted file mode 100644 index 4f4243f947f..00000000000 --- a/src/glsl/glcpp/tests/109-no-space-after-hash-line.c.expected +++ /dev/null @@ -1 +0,0 @@ -0:1(1): preprocessor error: Illegal non-directive after # diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c b/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c deleted file mode 100644 index 6d7d0f38d9a..00000000000 --- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c +++ /dev/null @@ -1,3 +0,0 @@ -#if 1 -#elif110 -#endif diff --git a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected b/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected deleted file mode 100644 index 4d93de41dd3..00000000000 --- a/src/glsl/glcpp/tests/110-no-space-digits-after-hash-elif.c.expected +++ /dev/null @@ -1,3 +0,0 @@ -0:2(1): preprocessor error: Illegal non-directive after # - - diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c b/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c deleted file mode 100644 index b3413371ec2..00000000000 --- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c +++ /dev/null @@ -1,19 +0,0 @@ -#if(1) -success -#endif - -#if+1 -success -#endif - -#if-1 -success -#endif - -#if!1 -success -#endif - -#if~1 -success -#endif diff --git a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected b/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected deleted file mode 100644 index 5c005c393a9..00000000000 --- a/src/glsl/glcpp/tests/111-no-space-operator-after-hash-if.c.expected +++ /dev/null @@ -1,19 +0,0 @@ - -success - - - -success - - - -success - - - - - - - -success - diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c b/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c deleted file mode 100644 index e8221bc49c3..00000000000 --- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c +++ /dev/null @@ -1,24 +0,0 @@ -#if 0 -#elif(1) -success -#endif - -#if 0 -#elif+1 -success -#endif - -#if 0 -#elif-1 -success -#endif - -#if 0 -#elif!1 -success -#endif - -#if 0 -#elif~1 -success -#endif diff --git a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected b/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected deleted file mode 100644 index 86b37036b65..00000000000 --- a/src/glsl/glcpp/tests/112-no-space-operator-after-hash-elif.c.expected +++ /dev/null @@ -1,24 +0,0 @@ - - -success - - - - -success - - - - -success - - - - - - - - - -success - diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c b/src/glsl/glcpp/tests/113-line-and-file-macros.c deleted file mode 100644 index 369c4879260..00000000000 --- a/src/glsl/glcpp/tests/113-line-and-file-macros.c +++ /dev/null @@ -1,7 +0,0 @@ -1. Number of dalmations: __LINE__ __FILE__ __LINE__ -2. Nominal visual acuity: __LINE__ __FILE__ / __LINE__ __FILE__ -3. Battle of Thermopylae, as film: __LINE__ __FILE__ __FILE__ -4. HTTP code for "Not Found": __LINE__ __FILE__ __LINE__ -5. Hexadecimal for 20560: __LINE__ __FILE__ __LINE__ __FILE__ -6: Zip code for Nortonville, KS: __LINE__ __LINE__ __FILE__ __LINE__ __FILE__ -7. James Bond, as a number: __FILE__ __FILE__ __LINE__ diff --git a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected b/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected deleted file mode 100644 index 55bc788ffd7..00000000000 --- a/src/glsl/glcpp/tests/113-line-and-file-macros.c.expected +++ /dev/null @@ -1,7 +0,0 @@ -1. Number of dalmations: 1 0 1 -2. Nominal visual acuity: 2 0 / 2 0 -3. Battle of Thermopylae, as film: 3 0 0 -4. HTTP code for "Not Found": 4 0 4 -5. Hexadecimal for 20560: 5 0 5 0 -6: Zip code for Nortonville, KS: 6 6 0 6 0 -7. James Bond, as a number: 0 0 7 diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c b/src/glsl/glcpp/tests/114-paste-integer-tokens.c deleted file mode 100644 index d80d9c7ef4b..00000000000 --- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c +++ /dev/null @@ -1,7 +0,0 @@ -#define PASTE3(a,b,c) a ## b ## c -#define PASTE4(a,b,c,d) a ## b ## c ## d -#define PASTE5(a,b,c,d,e) a ## b ## c ## d ## e -4. HTTP code for "Not Found": PASTE3(__LINE__, __FILE__ , __LINE__) -5. Hexadecimal for 20560: PASTE4(__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__) diff --git a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected b/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected deleted file mode 100644 index aa9711034a6..00000000000 --- a/src/glsl/glcpp/tests/114-paste-integer-tokens.c.expected +++ /dev/null @@ -1,7 +0,0 @@ - - - -4. HTTP code for "Not Found": 404 -5. Hexadecimal for 20560: 5050 -6: Zip code for Nortonville, KS: 66060 -7. James Bond, as a number: 007 diff --git a/src/glsl/glcpp/tests/115-line-continuations.c b/src/glsl/glcpp/tests/115-line-continuations.c deleted file mode 100644 index 105590d85ed..00000000000 --- a/src/glsl/glcpp/tests/115-line-continuations.c +++ /dev/null @@ -1,9 +0,0 @@ -// This comment continues to the next line, hiding the define \ -#define CONTINUATION_UNSUPPORTED - -#ifdef CONTINUATION_UNSUPPORTED -failure -#else -success -#endif - diff --git a/src/glsl/glcpp/tests/115-line-continuations.c.expected b/src/glsl/glcpp/tests/115-line-continuations.c.expected deleted file mode 100644 index 428b5e822c5..00000000000 --- a/src/glsl/glcpp/tests/115-line-continuations.c.expected +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - -success - - diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c b/src/glsl/glcpp/tests/116-disable-line-continuations.c deleted file mode 100644 index 83d5ddf681b..00000000000 --- a/src/glsl/glcpp/tests/116-disable-line-continuations.c +++ /dev/null @@ -1,13 +0,0 @@ -// glcpp-args: --disable-line-continuations - -// This comments ends with a backslash \\ -#define NO_CONTINUATION - -#ifdef NO_CONTINUATION -success -#else -failure -#endif - - - diff --git a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected b/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected deleted file mode 100644 index 5ca78928a61..00000000000 --- a/src/glsl/glcpp/tests/116-disable-line-continuations.c.expected +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - -success - - - - - - diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c b/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c deleted file mode 100644 index 6a6f2829883..00000000000 --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c +++ /dev/null @@ -1,12 +0,0 @@ -/* This test case is the minimal case to replicate the bug reported here: - * - * https://bugs.freedesktop.org/show_bug.cgi?id=65112 - * - * To trigger the bug, there must be a line-continuation sequence - * (backslash newline), then an additional newline character, and - * finally another backslash that is not part of a line-continuation - * sequence. - */ -\ - -/* \ */ diff --git a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected b/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected deleted file mode 100644 index 8aaa04d28e4..00000000000 --- a/src/glsl/glcpp/tests/117-line-continuation-and-non-continuation-backslash.c.expected +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c b/src/glsl/glcpp/tests/118-comment-becomes-space.c deleted file mode 100644 index 53e80394ab6..00000000000 --- a/src/glsl/glcpp/tests/118-comment-becomes-space.c +++ /dev/null @@ -1,4 +0,0 @@ -#define FOO first/* -*/second - -FOO diff --git a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected b/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected deleted file mode 100644 index 1fa8135cb13..00000000000 --- a/src/glsl/glcpp/tests/118-comment-becomes-space.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - - -first second diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c b/src/glsl/glcpp/tests/119-elif-after-else.c deleted file mode 100644 index 9b9e9233bcb..00000000000 --- a/src/glsl/glcpp/tests/119-elif-after-else.c +++ /dev/null @@ -1,6 +0,0 @@ -#if 0 -#else -int foo; -#elif 0 -int bar; -#endif diff --git a/src/glsl/glcpp/tests/119-elif-after-else.c.expected b/src/glsl/glcpp/tests/119-elif-after-else.c.expected deleted file mode 100644 index 636956799cd..00000000000 --- a/src/glsl/glcpp/tests/119-elif-after-else.c.expected +++ /dev/null @@ -1,7 +0,0 @@ -0:4(1): preprocessor error: #elif after #else - - -int foo; - -int bar; - diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c b/src/glsl/glcpp/tests/120-undef-builtin.c deleted file mode 100644 index 49e7696613e..00000000000 --- a/src/glsl/glcpp/tests/120-undef-builtin.c +++ /dev/null @@ -1,3 +0,0 @@ -#undef __LINE__ -#undef __FILE__ -#undef __VERSION__ diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/glsl/glcpp/tests/120-undef-builtin.c.expected deleted file mode 100644 index 3b736df378e..00000000000 --- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected +++ /dev/null @@ -1,6 +0,0 @@ -0:1(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined. -0:2(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined. -0:3(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined. - - - diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c b/src/glsl/glcpp/tests/121-comment-bug-72686.c deleted file mode 100644 index 67ebe73e5cf..00000000000 --- a/src/glsl/glcpp/tests/121-comment-bug-72686.c +++ /dev/null @@ -1,2 +0,0 @@ -/* - */ // diff --git a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected b/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected deleted file mode 100644 index 8cb7cb9891f..00000000000 --- a/src/glsl/glcpp/tests/121-comment-bug-72686.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c b/src/glsl/glcpp/tests/122-redefine-whitespace.c deleted file mode 100644 index ae7ea09f67e..00000000000 --- a/src/glsl/glcpp/tests/122-redefine-whitespace.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Original definitions. */ -#define TWO ( 1+1 ) -#define FOUR (2 + 2) -#define SIX (3 + 3) - -/* Redefinitions with whitespace in same places, but different amounts, (so no - * error). */ -#define TWO ( 1+1 ) -#define FOUR (2 + 2) -#define SIX (3/*comment is whitespace*/+ /* collapsed */ /* to */ /* one */ /* space */ 3) - -/* Redefinitions with whitespace in different places. Each of these should - * trigger an error. */ -#define TWO (1 + 1) -#define FOUR ( 2+2 ) -#define SIX (/*not*/3 + 3/*expected*/) diff --git a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected b/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected deleted file mode 100644 index 602bdef94c2..00000000000 --- a/src/glsl/glcpp/tests/122-redefine-whitespace.c.expected +++ /dev/null @@ -1,22 +0,0 @@ -0:14(9): preprocessor error: Redefinition of macro TWO - -0:15(9): preprocessor error: Redefinition of macro FOUR - -0:16(9): preprocessor error: Redefinition of macro SIX - - - - - - - - - - - - - - - - - diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c b/src/glsl/glcpp/tests/123-garbage-after-else-1.c deleted file mode 100644 index 0b341a381f8..00000000000 --- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c +++ /dev/null @@ -1,3 +0,0 @@ -#if 1 -#else garbage -#endif diff --git a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected b/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected deleted file mode 100644 index b053b399775..00000000000 --- a/src/glsl/glcpp/tests/123-garbage-after-else-1.c.expected +++ /dev/null @@ -1,4 +0,0 @@ -0:2(7): preprocessor error: syntax error, unexpected IDENTIFIER, expecting NEWLINE -0:1(6): preprocessor error: Unterminated #if - - diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c b/src/glsl/glcpp/tests/124-preprocessing-numbers.c deleted file mode 100644 index 947ba1885ec..00000000000 --- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c +++ /dev/null @@ -1,37 +0,0 @@ -#define e THIS_SHOULD_NOT_BE_EXPANDED -#define E NOR_THIS -#define p NOT_THIS_EITHER -#define P AND_SURELY_NOT_THIS -#define OK CRAZY_BUT_TRUE_THIS_NEITHER - -/* This one is actually meant to be expanded */ -#define MUST_EXPAND GO - -/* The following are "preprocessing numbers" and should not trigger macro - * expansion. */ -1e -1OK - -/* These are also "preprocessing numbers", so no expansion */ -123e+OK -.23E+OK -1.3e-OK -12.E-OK -123p+OK -.23P+OK -1.3p-OK -12.P-OK -123..OK -.23.OK.OK - -/* Importantly, just before the MUST_EXPAND in each of these, the preceding - * "preprocessing number" ends and we have an actual expression. So the - * MUST_EXPAND macro must be expanded (who would have though?) in each case. */ -123ef+MUST_EXPAND -.23E3-MUST_EXPAND -1.3e--MUST_EXPAND -12.E-&MUST_EXPAND -123p+OK+MUST_EXPAND -.23P+OK;MUST_EXPAND -1.3p-OK-MUST_EXPAND -12.P-OK&MUST_EXPAND diff --git a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected b/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected deleted file mode 100644 index 6ec588862d6..00000000000 --- a/src/glsl/glcpp/tests/124-preprocessing-numbers.c.expected +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - -1e -1OK - - -123e+OK -.23E+OK -1.3e-OK -12.E-OK -123p+OK -.23P+OK -1.3p-OK -12.P-OK -123..OK -.23.OK.OK - - - - -123ef+GO -.23E3-GO -1.3e--GO -12.E-&GO -123p+OK+GO -.23P+OK;GO -1.3p-OK-GO -12.P-OK&GO diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c b/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c deleted file mode 100644 index 4ee29f6d93f..00000000000 --- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c +++ /dev/null @@ -1,27 +0,0 @@ -/* For GLSL in OpenGL ES, an undefined macro appearing in an #if or #elif - * expression, (other than as an argument to defined) is an error. - * - * Except in the case of a short-circuiting && or || operator, where the - * specification explicitly mandates that there be no error. - */ -#version 300 es - -/* These yield errors */ -#if NOT_DEFINED -#endif - -#if 0 -#elif ALSO_NOT_DEFINED -#endif - -/* But these yield no errors */ -#if 1 || STILL_NOT_DEFINED -Success -#endif - -#if 0 -#elif 0 && WILL_ANYONE_DEFINE_ANYTHING -#else -More success -#endif - diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected b/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected deleted file mode 100644 index 616aa912e2f..00000000000 --- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected +++ /dev/null @@ -1,29 +0,0 @@ -0:10(16): preprocessor error: undefined macro NOT_DEFINED in expression (illegal in GLES) -0:14(23): preprocessor error: undefined macro ALSO_NOT_DEFINED in expression (illegal in GLES) - - - - - - -#version 300 es - - - - - - - - - - - -Success - - - - - -More success - - diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c b/src/glsl/glcpp/tests/126-garbage-after-directive.c deleted file mode 100644 index 4c0d29000a3..00000000000 --- a/src/glsl/glcpp/tests/126-garbage-after-directive.c +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef MACRO garbage -#endif - -#ifndef MORE garbage -#endif diff --git a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected b/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected deleted file mode 100644 index 82a06f8a3b3..00000000000 --- a/src/glsl/glcpp/tests/126-garbage-after-directive.c.expected +++ /dev/null @@ -1,7 +0,0 @@ -0:1(14): preprocessor error: extra tokens at end of directive -0:4(14): preprocessor error: extra tokens at end of directive - - - - - diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c b/src/glsl/glcpp/tests/127-pragma-empty.c deleted file mode 100644 index 0f9b0b3d38f..00000000000 --- a/src/glsl/glcpp/tests/127-pragma-empty.c +++ /dev/null @@ -1,3 +0,0 @@ -/* It seems an odd (and particularly useless) thing to have an empty pragma, - * but we probably shouldn't trigger an error in this case. */ -#pragma diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected b/src/glsl/glcpp/tests/127-pragma-empty.c.expected deleted file mode 100644 index 92371a07c32..00000000000 --- a/src/glsl/glcpp/tests/127-pragma-empty.c.expected +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c b/src/glsl/glcpp/tests/128-space-before-hash.c deleted file mode 100644 index fba9596baf8..00000000000 --- a/src/glsl/glcpp/tests/128-space-before-hash.c +++ /dev/null @@ -1,21 +0,0 @@ - /* Any directive can be preceded by a space. */ - #version 300 - #pragma Testing spaces before hash - # - #line 3 - #define FOO - #ifdef FOO - yes - #endif - #if 0 - #elif defined FOO - yes again - #endif - #if 0 - #else - for the third time, yes! - #endif - #undef FOO - #ifndef FOO - yes, of course - #endif diff --git a/src/glsl/glcpp/tests/128-space-before-hash.c.expected b/src/glsl/glcpp/tests/128-space-before-hash.c.expected deleted file mode 100644 index 9babb6fb078..00000000000 --- a/src/glsl/glcpp/tests/128-space-before-hash.c.expected +++ /dev/null @@ -1,21 +0,0 @@ - -#version 300 -#pragma Testing spaces before hash - -#line 3 - - - yes - - - - yes again - - - - for the third time, yes! - - - - yes, of course - diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c b/src/glsl/glcpp/tests/129-define-non-identifier.c deleted file mode 100644 index a229179f18c..00000000000 --- a/src/glsl/glcpp/tests/129-define-non-identifier.c +++ /dev/null @@ -1 +0,0 @@ -#define 123 456 diff --git a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected b/src/glsl/glcpp/tests/129-define-non-identifier.c.expected deleted file mode 100644 index fd0b41347fa..00000000000 --- a/src/glsl/glcpp/tests/129-define-non-identifier.c.expected +++ /dev/null @@ -1,2 +0,0 @@ -0:1(9): preprocessor error: #define followed by a non-identifier: 123 -0:1(9): preprocessor error: syntax error, unexpected INTEGER_STRING, expecting FUNC_IDENTIFIER or OBJ_IDENTIFIER diff --git a/src/glsl/glcpp/tests/130-define-comment.c b/src/glsl/glcpp/tests/130-define-comment.c deleted file mode 100644 index 33312362cc7..00000000000 --- a/src/glsl/glcpp/tests/130-define-comment.c +++ /dev/null @@ -1,2 +0,0 @@ -#define /*...*/ FUNC( /*...*/ x /*...*/ ) /*...*/ FOO( /*...*/ x /*...*/ ) -FUNC(bar) diff --git a/src/glsl/glcpp/tests/130-define-comment.c.expected b/src/glsl/glcpp/tests/130-define-comment.c.expected deleted file mode 100644 index d789e29d5a8..00000000000 --- a/src/glsl/glcpp/tests/130-define-comment.c.expected +++ /dev/null @@ -1,2 +0,0 @@ - -FOO( bar ) diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c b/src/glsl/glcpp/tests/131-eof-without-newline.c deleted file mode 100644 index 240292dad01..00000000000 --- a/src/glsl/glcpp/tests/131-eof-without-newline.c +++ /dev/null @@ -1 +0,0 @@ -this file ends with no newline
\ No newline at end of file diff --git a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected b/src/glsl/glcpp/tests/131-eof-without-newline.c.expected deleted file mode 100644 index 57800306322..00000000000 --- a/src/glsl/glcpp/tests/131-eof-without-newline.c.expected +++ /dev/null @@ -1 +0,0 @@ -this file ends with no newline diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c b/src/glsl/glcpp/tests/132-eof-without-newline-define.c deleted file mode 100644 index 6795e35ea00..00000000000 --- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c +++ /dev/null @@ -1 +0,0 @@ -#define
\ No newline at end of file diff --git a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected b/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected deleted file mode 100644 index 341e5e2aa67..00000000000 --- a/src/glsl/glcpp/tests/132-eof-without-newline-define.c.expected +++ /dev/null @@ -1 +0,0 @@ -0:1(1): preprocessor error: #define without macro name diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c b/src/glsl/glcpp/tests/133-eof-without-newline-comment.c deleted file mode 100644 index 56ec5f722c0..00000000000 --- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c +++ /dev/null @@ -1 +0,0 @@ -This file ends with no newline within a comment /*
\ No newline at end of file diff --git a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected b/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected deleted file mode 100644 index d186f48761f..00000000000 --- a/src/glsl/glcpp/tests/133-eof-without-newline-comment.c.expected +++ /dev/null @@ -1,2 +0,0 @@ -0:1(51): preprocessor error: Unterminated comment -This file ends with no newline within a comment diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c b/src/glsl/glcpp/tests/134-hash-comment-directive.c deleted file mode 100644 index 3015f0e886e..00000000000 --- a/src/glsl/glcpp/tests/134-hash-comment-directive.c +++ /dev/null @@ -1,22 +0,0 @@ -/*...*/ # /*...*/ version 300 - /*...*/#/*...*/ extension whatever - /*..*/ # /*..*/ pragma ignored -/**/ # /**/ line 4 - /*...*/# /*...*/ ifdef NOT_DEFINED - /*...*/# /*...*/ else - /*..*/ #/*..*/ endif - /*...*/# /*...*/ ifndef ALSO_NOT_DEFINED - /*...*/# /*...*/ else - /*..*/ #/*..*/ endif -/*...*/ # /*...*/ if 0 - /*...*/#/*...*/ elif 1 - /*..*/ # /*..*/ else - /**/ # /**/ endif - /*...*/# /*...*/ define FOO bar - /*..*/ #/*..*/ define FUNC() baz - /*..*/ # /*..*/ define FUNC2(a,b) b a -FOO -FUNC() -FUNC2(x,y) - - diff --git a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected b/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected deleted file mode 100644 index 760c960cb62..00000000000 --- a/src/glsl/glcpp/tests/134-hash-comment-directive.c.expected +++ /dev/null @@ -1,22 +0,0 @@ -#version 300 -#extension whatever -#pragma ignored -#line 4 - - - - - - - - - - - - - -bar -baz -y x - - diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c b/src/glsl/glcpp/tests/135-duplicate-parameter.c deleted file mode 100644 index fd96bd64c74..00000000000 --- a/src/glsl/glcpp/tests/135-duplicate-parameter.c +++ /dev/null @@ -1,2 +0,0 @@ -#define FOO(a,a) which a? -#define BAR(x,y,z,x) so very x diff --git a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected b/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected deleted file mode 100644 index bc1a334ed29..00000000000 --- a/src/glsl/glcpp/tests/135-duplicate-parameter.c.expected +++ /dev/null @@ -1,4 +0,0 @@ -0:1(9): preprocessor error: Duplicate macro parameter "a" -0:2(9): preprocessor error: Duplicate macro parameter "x" - - diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c b/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c deleted file mode 100644 index 167d3c8a3cf..00000000000 --- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c +++ /dev/null @@ -1,8 +0,0 @@ -/* The body can include C expressions with ++ and -- */ -a = x++; -b = ++x; -c = x--; -d = --x; -/* But these are not legal in preprocessor expressions. */ -#if x++ > 4 -#endif diff --git a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected b/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected deleted file mode 100644 index 137921b1695..00000000000 --- a/src/glsl/glcpp/tests/136-plus-plus-and-minus-minus.c.expected +++ /dev/null @@ -1,8 +0,0 @@ -0:7(12): preprocessor error: syntax error, unexpected PLUS_PLUS - -a = x++; -b = ++x; -c = x--; -d = --x; - - diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c b/src/glsl/glcpp/tests/137-expand-macro-after-period.c deleted file mode 100644 index c8cd47fb57e..00000000000 --- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c +++ /dev/null @@ -1,4 +0,0 @@ -#define FIELD(x) foo.x -#define FIELD_OF(s, x) s.x -FIELD(bar) -FIELD_OF(foo, bar) diff --git a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected b/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected deleted file mode 100644 index f9f5be13e01..00000000000 --- a/src/glsl/glcpp/tests/137-expand-macro-after-period.c.expected +++ /dev/null @@ -1,4 +0,0 @@ - - -foo.bar -foo.bar diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c b/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c deleted file mode 100644 index 38967dc57d1..00000000000 --- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c +++ /dev/null @@ -1,7 +0,0 @@ -#if 0 -/* - * This multi-line comment needs to be 3 lines to test what's intended. - */ -#else -SUCCESS -#endif diff --git a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected b/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected deleted file mode 100644 index 0d6ef4d9ad4..00000000000 --- a/src/glsl/glcpp/tests/138-multi-line-comment-in-if-0.c.expected +++ /dev/null @@ -1,7 +0,0 @@ - - - - - -SUCCESS - diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c b/src/glsl/glcpp/tests/139-define-without-macro-name.c deleted file mode 100644 index 30e128db4c5..00000000000 --- a/src/glsl/glcpp/tests/139-define-without-macro-name.c +++ /dev/null @@ -1,5 +0,0 @@ -#define -#define -#define /*...*/ -#define //... -Errors expected because no macro name is ever given! diff --git a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected b/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected deleted file mode 100644 index 42b02d1a8a1..00000000000 --- a/src/glsl/glcpp/tests/139-define-without-macro-name.c.expected +++ /dev/null @@ -1,5 +0,0 @@ -0:1(1): preprocessor error: #define without macro name -0:2(1): preprocessor error: #define without macro name -0:3(1): preprocessor error: #define without macro name -0:4(1): preprocessor error: #define without macro name -Errors expected because no macro name is ever given! diff --git a/src/glsl/glcpp/tests/140-null-directive.c b/src/glsl/glcpp/tests/140-null-directive.c deleted file mode 100644 index 1dcb26ef8b9..00000000000 --- a/src/glsl/glcpp/tests/140-null-directive.c +++ /dev/null @@ -1,9 +0,0 @@ -/* GLSL accepts a null directive. Let's test that in several variations: */ -# - # -/*....*/#/*....*/ - /*..*/ # /*..*/ -#//... - # //... -/*....*/#/**///.. - /*..*/ # /**/ // diff --git a/src/glsl/glcpp/tests/140-null-directive.c.expected b/src/glsl/glcpp/tests/140-null-directive.c.expected deleted file mode 100644 index fa103f60e82..00000000000 --- a/src/glsl/glcpp/tests/140-null-directive.c.expected +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c b/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c deleted file mode 100644 index a93f3ce35fd..00000000000 --- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c +++ /dev/null @@ -1,6 +0,0 @@ -Line 1 /* Test for a bug where #pragma was throwing off the __LINE__ count. */ -Line __LINE__ /* Line 2 */ -#pragma Line 3 -Line __LINE__ /* Line 4 */ -#pragma Line 5 -Line __LINE__ /* Line 6 */ diff --git a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected b/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected deleted file mode 100644 index 330731dc800..00000000000 --- a/src/glsl/glcpp/tests/141-pragma-and-__LINE__.c.expected +++ /dev/null @@ -1,6 +0,0 @@ -Line 1 -Line 2 -#pragma Line 3 -Line 4 -#pragma Line 5 -Line 6 diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c b/src/glsl/glcpp/tests/142-defined-within-macro.c deleted file mode 100644 index b60c04232a6..00000000000 --- a/src/glsl/glcpp/tests/142-defined-within-macro.c +++ /dev/null @@ -1,94 +0,0 @@ -/* Macro using defined with a hard-coded identifier (no parentheses) */ -#define is_foo_defined defined /*...*/ foo -#undef foo -#if is_foo_defined -failure -#else -success -#endif -#define foo -#if is_foo_defined -success -#else -failure -#endif - -/* Macro using defined with a hard-coded identifier within parentheses */ -#define is_foo_defined_parens defined /*...*/ ( /*...*/ foo /*...*/ ) // -#define foo -#if is_foo_defined_parens -success -#else -failure -#endif -#undef foo -#if is_foo_defined_parens -failure -#else -success -#endif - -/* Macro using defined with an argument identifier (no parentheses) */ -#define is_defined(arg) defined /*...*/ arg -#define foo bar -#undef bar -#if is_defined(foo) -failure -#else -success -#endif -#define bar bar -#if is_defined(foo) -success -#else -failure -#endif - -/* Macro using defined with an argument identifier within parentheses */ -#define is_defined_parens(arg) defined /*...*/ ( /*...*/ arg /*...*/ ) // -#define foo bar -#define bar bar -#if is_defined_parens(foo) -success -#else -failure -#endif -#undef bar -#if is_defined_parens(foo) -failure -#else -success -#endif - -/* Multiple levels of macro resulting in defined */ -#define X defined A && Y -#define Y defined B && Z -#define Z defined C -#define A -#define B -#define C -#if X -success -#else -failure -#endif -#undef A -#if X -failure -#else -success -#endif -#define A -#undef B -#if X -failure -#else -success -#endif -#define B -#undef C -#if X -failure -#else -success -#endif diff --git a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected b/src/glsl/glcpp/tests/142-defined-within-macro.c.expected deleted file mode 100644 index 4eca90bc3db..00000000000 --- a/src/glsl/glcpp/tests/142-defined-within-macro.c.expected +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - -success - - - -success - - - - - - - - -success - - - - - - - -success - - - - - - - - - -success - - - -success - - - - - - - - - -success - - - - - - - -success - - - - - - - - - - -success - - - - - - - -success - - - - - - -success - - - - - - -success - diff --git a/src/glsl/glcpp/tests/143-multiple-else.c b/src/glsl/glcpp/tests/143-multiple-else.c deleted file mode 100644 index 62ad49cf7bb..00000000000 --- a/src/glsl/glcpp/tests/143-multiple-else.c +++ /dev/null @@ -1,6 +0,0 @@ -#if 0 -#else -int foo; -#else -int bar; -#endif diff --git a/src/glsl/glcpp/tests/143-multiple-else.c.expected b/src/glsl/glcpp/tests/143-multiple-else.c.expected deleted file mode 100644 index 00b3328c835..00000000000 --- a/src/glsl/glcpp/tests/143-multiple-else.c.expected +++ /dev/null @@ -1,7 +0,0 @@ -0:4(1): preprocessor error: multiple #else - - -int foo; - -int bar; - diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test deleted file mode 100755 index 825c22e71fb..00000000000 --- a/src/glsl/glcpp/tests/glcpp-test +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh - -if [ ! -z "$srcdir" ]; then - testdir=$srcdir/glcpp/tests - outdir=`pwd`/glcpp/tests - glcpp=`pwd`/glcpp/glcpp -else - testdir=. - outdir=. - glcpp=../glcpp -fi - -trap 'rm $test.valgrind-errors; exit 1' INT QUIT - -usage () -{ - cat <<EOF -Usage: glcpp [options...] - -Run the test suite for mesa's GLSL pre-processor. - -Valid options include: - - --testdir=<DIR> Use tests in the given <DIR> (default is ".") - --valgrind Run the test suite a second time under valgrind -EOF -} - -test_specific_args () -{ - test="$1" - - tr "\r" "\n" < "$test" | grep 'glcpp-args:' | sed -e 's,^.*glcpp-args: *,,' -} - -# Parse command-line options -for option; do - case "${option}" in - "--help") - usage - exit 0 - ;; - "--valgrind") - do_valgrind=yes - ;; - "--testdir="*) - testdir="${option#--testdir=}" - outdir="${outdir}/${option#--testdir=}" - ;; - *) - echo "Unrecognized option: $option" >&2 - echo >&2 - usage - exit 1 - ;; - esac -done - -total=0 -pass=0 -clean=0 - -mkdir -p $outdir - -echo "====== Testing for correctness ======" -for test in $testdir/*.c; do - out=$outdir/${test##*/}.out - - printf "Testing $test... > $out ($test.expected) " - $glcpp $(test_specific_args $test) < $test > $out 2>&1 - total=$((total+1)) - if cmp $test.expected $out >/dev/null 2>&1; then - echo "PASS" - pass=$((pass+1)) - else - echo "FAIL" - diff -u $test.expected $out - fi -done - -echo "" -echo "$pass/$total tests returned correct results" -echo "" - -if [ "$do_valgrind" = "yes" ]; then - echo "====== Testing for valgrind cleanliness ======" - for test in $testdir/*.c; do - printf "Testing $test with valgrind..." - valgrind --error-exitcode=31 --log-file=$test.valgrind-errors $glcpp $(test_specific_args $test) < $test >/dev/null 2>&1 - if [ "$?" = "31" ]; then - echo "ERRORS" - cat $test.valgrind-errors - else - echo "CLEAN" - clean=$((clean+1)) - rm $test.valgrind-errors - fi - done - - echo "" - echo "$pass/$total tests returned correct results" - echo "$clean/$total tests are valgrind-clean" -fi - -if [ "$pass" = "$total" ] && [ "$do_valgrind" != "yes" ] || [ "$pass" = "$total" ]; then - exit 0 -else - exit 1 -fi - diff --git a/src/glsl/glcpp/tests/glcpp-test-cr-lf b/src/glsl/glcpp/tests/glcpp-test-cr-lf deleted file mode 100755 index c4ed0b86d74..00000000000 --- a/src/glsl/glcpp/tests/glcpp-test-cr-lf +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh - -# The build system runs this test from a different working directory, and may -# be in a build directory entirely separate from the source. So if the -# "srcdir" variable is set, we must use it to locate the test files and the -# glcpp-test script. - -if [ ! -z "$srcdir" ]; then - testdir="$srcdir/glcpp/tests" - glcpp_test="$srcdir/glcpp/tests/glcpp-test" -else - testdir=. - glcpp_test=./glcpp-test -fi - -total=0 -pass=0 - -# This supports a pipe that doesn't destroy the exit status of first command -# -# http://unix.stackexchange.com/questions/14270/get-exit-status-of-process-thats-piped-to-another -stdintoexitstatus() { - read exitstatus - return $exitstatus -} - -run_test () -{ - cmd="$1" - - total=$((total+1)) - - if [ "$VERBOSE" = "yes" ]; then - if $cmd; then - echo "PASS" - pass=$((pass+1)) - else - echo "FAIL" - fi - else - # This is "$cmd | tail -2" but with the exit status of "$cmd" not "tail -2" - if (((($cmd; echo $? >&3) | tail -2 | head -1 >&4) 3>&1) | stdintoexitstatus) 4>&1; then - echo "PASS" - pass=$((pass+1)) - else - echo "FAIL" - fi - fi -} - -usage () -{ - cat <<EOF -Usage: glcpp-cr-lf [options...] - -Run the entire glcpp-test suite several times, each time with each source -file transformed to use a non-standard line-termination character. Each -entire run with a different line-termination character is considered a -single test. - -Valid options include: - - -v|--verbose Print all output from the various sub-tests -EOF -} - -# Parse command-line options -for option; do - case "${option}" in - -v|--verbose) - VERBOSE=yes; - ;; - *) - echo "Unrecognized option: $option" >&2 - echo >&2 - usage - exit 1 - ;; - esac -done - -# All tests depend on the .out files being present. So first do a -# normal run of the test suite, (silently) just to create the .out -# files as a side effect. -rm -rf ./subtest-lf -mkdir subtest-lf -for file in "$testdir"/*.c; do - base=$(basename "$file") - cp "$file" subtest-lf -done - -${glcpp_test} --testdir=subtest-lf >/dev/null 2>&1 - -echo "===== Testing with \\\\r line terminators (old Mac format) =====" - -# Prepare test files with '\r' instead of '\n' -rm -rf ./subtest-cr -mkdir subtest-cr -for file in "$testdir"/*.c; do - base=$(basename "$file") - tr "\n" "\r" < "$file" > subtest-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected -done - -run_test "${glcpp_test} --testdir=subtest-cr" - -echo "===== Testing with \\\\r\\\\n line terminators (DOS format) =====" - -# Prepare test files with '\r\n' instead of '\n' -rm -rf ./subtest-cr-lf -mkdir subtest-cr-lf -for file in "$testdir"/*.c; do - base=$(basename "$file") - sed -e 's/$/
/' < "$file" > subtest-cr-lf/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected -done - -run_test "${glcpp_test} --testdir=subtest-cr-lf" - -echo "===== Testing with \\\\n\\\\r (bizarre, but allowed by GLSL spec.) =====" - -# Prepare test files with '\n\r' instead of '\n' -rm -rf ./subtest-lf-cr -mkdir subtest-lf-cr -for file in "$testdir"/*.c; do - base=$(basename "$file") - sed -e 's/$/
/' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base" - cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected -done - -run_test "${glcpp_test} --testdir=subtest-lf-cr" - -echo "" -echo "$pass/$total tests returned correct results" -echo "" - -if [ "$pass" = "$total" ]; then - exit 0 -else - exit 1 -fi |