test suite: Add expected output for every test.

Rather than using the (munged) output of "gcc -E" we now capture
precisely the output we expect from every test case. This allows us to
stay immune from strange output from gcc (unpredictable whitespace
output---aprticularly with different gcc versions).

This will also allow us to write tests that capture expected error
messages from the preprocessor as well.

.gitignore

@@ -4,7 +4,4 @@ glcpp-parse.c
 glcpp-parse.h
 *.o
 *~
-tests/*.expected
-tests/*.gcc
-tests/*.glcpp
 tests/*.out

Makefile

@@ -22,4 +22,4 @@ test: glcpp
 
 clean:
 	rm -f glcpp glcpp-lex.c glcpp-parse.c *.o *~
-	rm -f tests/*.out tests/*.gcc tests/*.expected tests/*~
+	rm -f tests/*.out tests/*~

tests/000-content-with-spaces.c.expected

@@ -0,0 +1 @@
+this is four tokens

tests/001-define.c.expected

@@ -0,0 +1,2 @@
+
+1

tests/002-define-chain.c.expected

@@ -0,0 +1,3 @@
+
+
+1

tests/003-define-chain-reverse.c.expected

@@ -0,0 +1,3 @@
+
+
+1

tests/004-define-recursive.c.expected

@@ -0,0 +1,6 @@
+
+
+
+foo
+bar
+baz

tests/005-define-composite-chain.c.expected

@@ -0,0 +1,3 @@
+
+
+a 1

tests/006-define-composite-chain-reverse.c.expected

@@ -0,0 +1,3 @@
+
+
+a 1

tests/007-define-composite-recursive.c.expected

@@ -0,0 +1,6 @@
+
+
+
+a b c foo
+b c a bar
+c a b baz

tests/008-define-empty.c.expected

@@ -0,0 +1,2 @@
+
+

tests/009-undef.c.expected

@@ -0,0 +1,4 @@
+
+1
+
+foo

tests/010-undef-re-define.c.expected

@@ -0,0 +1,6 @@
+
+1
+
+foo
+
+2

tests/011-define-func-empty.c.expected

@@ -0,0 +1,2 @@
+
+

tests/012-define-func-no-args.c.expected

@@ -0,0 +1,2 @@
+
+bar

tests/013-define-func-1-arg-unused.c.expected

@@ -0,0 +1,2 @@
+
+1

tests/014-define-func-2-arg-unused.c.expected

@@ -0,0 +1,2 @@
+
+1

tests/015-define-object-with-parens.c.expected

@@ -0,0 +1,4 @@
+
+()1()
+
+()2()

tests/016-define-func-1-arg.c.expected

@@ -0,0 +1,2 @@
+
+((bar)+1)

tests/017-define-func-2-args.c.expected

@@ -0,0 +1,2 @@
+
+((bar)*(baz))

tests/018-define-func-macro-as-parameter.c.expected

@@ -0,0 +1,3 @@
+
+
+1

tests/019-define-func-1-arg-multi.c.expected

@@ -0,0 +1,2 @@
+
+(this is more than one word)

tests/020-define-func-2-arg-multi.c.expected

@@ -0,0 +1,2 @@
+
+one fish,two fish,red fish,blue fish

tests/021-define-func-compose.c.expected

@@ -0,0 +1,3 @@
+
+
+(2*((1+(3))))

tests/022-define-func-arg-with-parens.c.expected

@@ -0,0 +1,2 @@
+
+(argument(including parens)for the win)

tests/023-define-extra-whitespace.c.expected

@@ -0,0 +1,8 @@
+
+
+
+
+1
+2
+3 4
+5 6 7

tests/024-define-chain-to-self-recursion.c.expected

@@ -0,0 +1,3 @@
+
+
+foo

tests/025-func-macro-as-non-macro.c.expected

@@ -0,0 +1,2 @@
+
+foo bar

tests/026-define-func-extra-newlines.c.expected

@@ -0,0 +1,3 @@
+
+
+bar

tests/027-define-chain-obj-to-func.c.expected

@@ -0,0 +1,3 @@
+
+
+success

tests/028-define-chain-obj-to-non-func.c.expected

@@ -0,0 +1,3 @@
+
+
+success

tests/029-define-chain-obj-to-func-with-args.c.expected

@@ -0,0 +1,3 @@
+
+
+success

tests/030-define-chain-obj-to-func-compose.c.expected

@@ -0,0 +1,4 @@
+
+
+
+success

tests/031-define-chain-func-to-func-compose.c.expected

@@ -0,0 +1,4 @@
+
+
+
+success

tests/032-define-func-self-recurse.c.expected

@@ -0,0 +1,2 @@
+
+foo(2*(3))

tests/033-define-func-self-compose.c.expected

@@ -0,0 +1,2 @@
+
+foo(2*(foo(2*(3))))

tests/034-define-func-self-compose-non-func.c.expected

@@ -0,0 +1,2 @@
+
+foo

tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected

@@ -0,0 +1,2 @@
+
+1+foo

tests/036-define-func-non-macro-multi-token-argument.c.expected

@@ -0,0 +1,3 @@
+
+
+more success

tests/037-finalize-unexpanded-macro.c.expected

@@ -0,0 +1,3 @@
+
+
+expand(just once)

tests/038-func-arg-with-commas.c.expected

@@ -0,0 +1,2 @@
+
+success

tests/039-func-arg-obj-macro-with-comma.c.expected

@@ -0,0 +1,3 @@
+
+
+(two,words)

tests/040-token-pasting.c.expected

@@ -0,0 +1,2 @@
+
+onetoken

tests/041-if-0.c.expected

@@ -0,0 +1,5 @@
+success_1
+
+
+
+success_2

tests/042-if-1.c.expected

@@ -0,0 +1,5 @@
+success_1
+
+success_2
+
+success_3

tests/043-if-0-else.c.expected

@@ -0,0 +1,7 @@
+success_1
+
+
+
+success_2
+
+success_3

tests/044-if-1-else.c.expected

@@ -0,0 +1,7 @@
+success_1
+
+success_2
+
+
+
+success_3

tests/045-if-0-elif.c.expected

@@ -0,0 +1,11 @@
+success_1
+
+
+
+
+
+success_3
+
+
+
+success_4

tests/046-if-1-elsif.c.expected

@@ -0,0 +1,11 @@
+success_1
+
+success_2
+
+
+
+
+
+
+
+success_3

tests/047-if-elif-else.c.expected

@@ -0,0 +1,11 @@
+success_1
+
+
+
+
+
+
+
+success_2
+
+success_3

tests/048-if-nested.c.expected

@@ -0,0 +1,11 @@
+success_1
+
+
+
+
+
+
+
+
+
+success_2

tests/049-if-expression-precedence.c.expected

@@ -0,0 +1,5 @@
+
+
+
+success
+

tests/050-if-defined.c.expected

@@ -0,0 +1,17 @@
+
+
+
+success_1
+
+
+
+success_2
+
+
+
+
+
+
+
+success_3
+

tests/051-if-relational.c.expected

@@ -0,0 +1,35 @@
+
+
+
+success_1
+
+
+
+success_2
+
+
+
+
+
+success_3
+
+
+
+
+
+success_3
+
+
+
+
+
+
+
+success_4
+
+
+
+success_5
+
+
+

tests/052-if-bitwise.c.expected

@@ -0,0 +1,20 @@
+
+
+
+success_1
+
+
+success_2
+
+
+
+
+
+
+success_3
+
+
+success_4
+
+
+

tests/053-if-divide-and-shift.c.expected

@@ -0,0 +1,15 @@
+
+
+
+success_1
+
+
+success_2
+
+
+
+
+
+
+success_3
+

tests/054-if-with-macros.c.expected

@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+success_1
+
+
+success_2
+
+
+
+
+success_3
+
+
+
+
+success_4
+
+
+
+
+
+
+success_5
+
+
+success_6
+
+
+

tests/055-define-chain-obj-to-func-parens-in-text.c.expected

@@ -0,0 +1,3 @@
+
+
+success

tests/056-macro-argument-with-comma.c.expected

@@ -0,0 +1,4 @@
+
+
+
+success

tests/057-empty-arguments.c.expected

@@ -0,0 +1,6 @@
+
+success
+
+success
+
+success

tests/058-token-pasting-empty-arguments.c.expected

@@ -0,0 +1,5 @@
+
+ab
+a
+b
+

tests/059-token-pasting-integer.c.expected

@@ -0,0 +1,4 @@
+
+12
+1000
+identifier2

tests/060-left-paren-in-macro-right-paren-in-text.c.expected

@@ -0,0 +1,3 @@
+
+
+5*2

tests/061-define-chain-obj-to-func-multi.c.expected

@@ -0,0 +1,5 @@
+
+
+
+
+success

tests/062-if-0-skips-garbage.c.expected

@@ -0,0 +1,5 @@
+
+
+
+
+

tests/063-comments.c.expected

@@ -0,0 +1,13 @@
+ 
+
+
+f = g /h;
+ l();
+m = n
++ p;
+ 
+more code here
+ 
+are not treated like comments.
+ 
+ 

tests/071-punctuator.c.expected

@@ -0,0 +1 @@
+a = b

tests/072-token-pasting-same-line.c.expected

@@ -0,0 +1,2 @@
+
+success_1 success_2 success_3

tests/099-c99-example.c.expected

@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+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, };

tests/glcpp-test

@@ -2,9 +2,6 @@
 
 for test in *.c; do
     echo "Testing $test"
-    ../glcpp < $test > $test.glcpp
-    grep -v '^ *$' < $test.glcpp > $test.out || true
-    gcc -E $test -o $test.gcc
-    grep -v '^#' < $test.gcc | grep -v '^$' | sed -r -e 's/^ +/ /' > $test.expected || true
+    ../glcpp < $test > $test.out
     diff -u $test.expected $test.out
 done