From fa9b5b99bff5a086623ac15e4001cddb4d1fba9b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 15 Apr 2003 09:40:23 +0000 Subject: Omit option -p from tests. --- ChangeLog | 10 ++++++++++ tests/Makefile.in | 20 ++++++++++---------- tests/c-parse.exp | 4 ++-- tests/c-parse.gperf | 2 +- tests/chill.exp | 2 +- tests/cplusplus.exp | 4 ++-- tests/cplusplus.gperf | 2 +- tests/gpc.exp | 2 +- tests/java.exp | 2 +- tests/objc.exp | 4 ++-- tests/objc.gperf | 2 +- tests/test-4.exp | 4 ++-- 12 files changed, 34 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58f48de..b9ba6bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2003-01-01 Bruno Haible + * tests/Makefile.in (check-link-c, check-ada, check-pascal, + check-test): Omit option -p. + * tests/c-parse.exp: Regenerated. + * tests/chill.exp: Regenerated. + * tests/cplusplus.exp: Regenerated. + * tests/gpc.exp: Regenerated. + * tests/java.exp: Regenerated. + * tests/objc.exp: Regenerated. + * tests/test-4.exp: Regenerated. + * src/output.cc (Output::output_lookup_function_body): Omit the multicompare code section and its variables when it is not used. * tests/chill.exp: Regenerated. diff --git a/tests/Makefile.in b/tests/Makefile.in index 0e670b5..5e9eacc 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -67,7 +67,7 @@ extracheck : @CHECK_LANG_SYNTAX@ check-link-c: force @echo "performing some tests of the perfect hash generator" $(CC) -c $(CFLAGS) $(srcdir)/test.c - $(GPERF) -p -c -l -S1 -I -o $(srcdir)/c.gperf > cinset.c + $(GPERF) -c -l -S1 -I -o $(srcdir)/c.gperf > cinset.c $(CC) $(CFLAGS) -o cout cinset.c test.o check-link-c++: force @@ -84,7 +84,7 @@ check-ada: @echo "testing Ada reserved words, all items should be found in the set" ./aout -v < $(srcdir)/ada.gperf > ada-res.out diff $(srcdir)/ada-res.exp ada-res.out - $(GPERF) -p -D -k1,'$$' -s 2 -I -o $(srcdir)/adadefs.gperf > preinset.c + $(GPERF) -D -k1,'$$' -s 2 -I -o $(srcdir)/adadefs.gperf > preinset.c $(CC) $(CFLAGS) -o preout preinset.c test.o @echo "testing Ada predefined words, all items should be found in the set" ./preout -v < $(srcdir)/adadefs.gperf > ada-pred.out @@ -98,7 +98,7 @@ check-modula3: diff $(srcdir)/modula.exp modula.out check-pascal: - $(GPERF) -o -S2 -p -I < $(srcdir)/pascal.gperf > pinset.c + $(GPERF) -o -S2 -I < $(srcdir)/pascal.gperf > pinset.c $(CC) $(CFLAGS) -o pout pinset.c test.o @echo "testing Pascal reserved words, all items should be found in the set" ./pout -v < $(srcdir)/pascal.gperf > pascal.out @@ -136,21 +136,21 @@ check-smtp: # these next 5 are demos that show off the generated code check-test: - $(GPERF) -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,'$$' < $(srcdir)/c-parse.gperf > c-parse.out + $(GPERF) -L C -F ', 0, 0' -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,'$$' < $(srcdir)/c-parse.gperf > c-parse.out diff $(srcdir)/c-parse.exp c-parse.out - $(GPERF) -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,'$$' < $(srcdir)/objc.gperf > objc.out + $(GPERF) -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,'$$' < $(srcdir)/objc.gperf > objc.out diff $(srcdir)/objc.exp objc.out - $(GPERF) -L C -F ', 0, 0, 0' -D -E -S1 -p -j1 -i 1 -g -o -t -k'*' < $(srcdir)/chill.gperf > chill.out + $(GPERF) -L C -F ', 0, 0, 0' -D -E -S1 -j1 -i 1 -g -o -t -k'*' < $(srcdir)/chill.gperf > chill.out diff $(srcdir)/chill.exp chill.out - $(GPERF) -L C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word -k1,4,7,'$$' < $(srcdir)/cplusplus.gperf > cplusplus.out + $(GPERF) -L C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k1,4,7,'$$' < $(srcdir)/cplusplus.gperf > cplusplus.out diff $(srcdir)/cplusplus.exp cplusplus.out - $(GPERF) -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,3,'$$' < $(srcdir)/java.gperf > java.out + $(GPERF) -L C -F ', 0' -t -j1 -i 1 -g -o -N java_keyword -k1,3,'$$' < $(srcdir)/java.gperf > java.out diff $(srcdir)/java.exp java.out $(GPERF) -n -k1-8 -l < $(srcdir)/modula2.gperf > modula2.out diff $(srcdir)/modula2.exp modula2.out - $(GPERF) -D -p -t -k1,'$$' < $(srcdir)/c-parse.gperf > test-4.out + $(GPERF) -D -t -k1,'$$' < $(srcdir)/c-parse.gperf > test-4.out diff $(srcdir)/test-4.exp test-4.out - $(GPERF) -g -o -j1 -t -p -N is_reserved_word < $(srcdir)/gpc.gperf > gpc.out + $(GPERF) -g -o -j1 -t -N is_reserved_word < $(srcdir)/gpc.gperf > gpc.out diff $(srcdir)/gpc.exp gpc.out $(GPERF) -m5 < $(srcdir)/permut2.gperf > permut2.out diff $(srcdir)/permut2.exp permut2.out diff --git a/tests/c-parse.exp b/tests/c-parse.exp index 65033c6..f934e70 100644 --- a/tests/c-parse.exp +++ b/tests/c-parse.exp @@ -1,7 +1,7 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k'1,3,$' */ +/* Command-line: ../src/gperf -L C -F ', 0, 0' -j1 -i 1 -g -o -t -G -N is_reserved_word -k'1,3,$' */ -/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ struct resword { const char *name; short token; enum rid rid; }; #define TOTAL_KEYWORDS 83 diff --git a/tests/c-parse.gperf b/tests/c-parse.gperf index 888eee9..efedfb9 100644 --- a/tests/c-parse.gperf +++ b/tests/c-parse.gperf @@ -1,5 +1,5 @@ %{ -/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ %} struct resword { const char *name; short token; enum rid rid; }; %% diff --git a/tests/chill.exp b/tests/chill.exp index 18f373a..36e71a2 100644 --- a/tests/chill.exp +++ b/tests/chill.exp @@ -1,5 +1,5 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -L C -F ', 0, 0, 0' -D -E -S1 -p -j1 -i 1 -g -o -t -k'*' */ +/* Command-line: ../src/gperf -L C -F ', 0, 0, 0' -D -E -S1 -j1 -i 1 -g -o -t -k'*' */ struct resword { const char *name; short token; diff --git a/tests/cplusplus.exp b/tests/cplusplus.exp index f8a4765..ac4eb33 100644 --- a/tests/cplusplus.exp +++ b/tests/cplusplus.exp @@ -1,7 +1,7 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -L C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word -k'1,4,7,$' */ +/* Command-line: ../src/gperf -L C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k'1,4,7,$' */ -/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word -k1,4,$,7 gplus.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k1,4,$,7 gplus.gperf */ struct resword { const char *name; short token; enum rid rid;}; #define TOTAL_KEYWORDS 106 diff --git a/tests/cplusplus.gperf b/tests/cplusplus.gperf index 1e621c4..8139e28 100644 --- a/tests/cplusplus.gperf +++ b/tests/cplusplus.gperf @@ -1,5 +1,5 @@ %{ -/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word -k1,4,$,7 gplus.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -j1 -g -o -t -N is_reserved_word -k1,4,$,7 gplus.gperf */ %} struct resword { const char *name; short token; enum rid rid;}; %% diff --git a/tests/gpc.exp b/tests/gpc.exp index 62ec8fd..f492e32 100644 --- a/tests/gpc.exp +++ b/tests/gpc.exp @@ -1,5 +1,5 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -g -o -j1 -t -p -N is_reserved_word */ +/* Command-line: ../src/gperf -g -o -j1 -t -N is_reserved_word */ /* Computed positions: -k'1,$' */ /* ISO Pascal 7185 reserved words. diff --git a/tests/java.exp b/tests/java.exp index 6965094..d0a4ae4 100644 --- a/tests/java.exp +++ b/tests/java.exp @@ -1,5 +1,5 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k'1,3,$' */ +/* Command-line: ../src/gperf -L C -F ', 0' -t -j1 -i 1 -g -o -N java_keyword -k'1,3,$' */ /* Keyword definition for the GNU compiler for the Java(TM) language. Copyright (C) 1997, 1998 Free Software Foundation, Inc. diff --git a/tests/objc.exp b/tests/objc.exp index 316f63d..664fafd 100644 --- a/tests/objc.exp +++ b/tests/objc.exp @@ -1,7 +1,7 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k'1,3,$' */ +/* Command-line: ../src/gperf -j1 -i 1 -g -o -t -N is_reserved_word -k'1,3,$' */ -/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ objc.gperf */ +/* Command-line: gperf -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ objc.gperf */ struct resword { char *name; short token; enum rid rid; }; #define TOTAL_KEYWORDS 59 diff --git a/tests/objc.gperf b/tests/objc.gperf index 407459f..f0e3290 100644 --- a/tests/objc.gperf +++ b/tests/objc.gperf @@ -1,5 +1,5 @@ %{ -/* Command-line: gperf -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ objc.gperf */ +/* Command-line: gperf -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ objc.gperf */ %} struct resword { char *name; short token; enum rid rid; }; %% diff --git a/tests/test-4.exp b/tests/test-4.exp index b72fcac..73b9848 100644 --- a/tests/test-4.exp +++ b/tests/test-4.exp @@ -1,7 +1,7 @@ /* C code produced by gperf version 2.7.2 */ -/* Command-line: ../src/gperf -D -p -t -k'1,$' */ +/* Command-line: ../src/gperf -D -t -k'1,$' */ -/* Command-line: gperf -L KR-C -F ', 0, 0' -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ +/* Command-line: gperf -L KR-C -F ', 0, 0' -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf */ struct resword { const char *name; short token; enum rid rid; }; #define TOTAL_KEYWORDS 83 -- cgit v1.2.1