fixinc testing cleanup
Bruce Korb
bkorb@pacbell.net
Sat May 26 11:24:00 GMT 2001
2001-05-26 Bruce Korb <bkorb@gnu.org>
* fixinc/fixtests.c(stdc_0_in_system_headers_test): Must return "FIX"
when fixincl is operating in test mode
* fixinc/inclhack.def(AAB_dgux_int_varargs) : aesthetics
(AAB_ultrix_limits): remove redundant text
(AAB_ultrix_memory): ditto
(AAB_ultrix_string): ditto
(djgpp_wchar_h): fix the test text
(irix_stdio_va_list): add test text
(irix_limits_const): add a testing output file (limits.h is overwritten)
(strict_ansi_not_ctd): put limits.h second in list for same reason
(solaris27_mutex_init): test text needed selection text, too
* fixinc/fixtests.c(stdc_0_in_system_headers_test): in testing mode,
always apply the fix
Index: inclhack.def
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/inclhack.def,v
retrieving revision 1.109
diff -u -u -r1.109 inclhack.def
--- inclhack.def 2001/05/25 21:36:08 1.109
+++ inclhack.def 2001/05/26 18:13:48
@@ -104,7 +104,8 @@
fix = {
hackname = AAB_dgux_int_varargs;
files = _int_varargs.h;
- replace = "#ifndef __INT_VARARGS_H
+ replace =
+"#ifndef __INT_VARARGS_H
\#define __INT_VARARGS_H
/************************************************************************/
@@ -537,9 +538,7 @@
files = limits.h;
mach = "*-*-ultrix4.3";
replace =
-'/* @(#)limits.h */
-/* This file was generated by fixincludes */
-\#ifndef _LIMITS_INCLUDED
+'#ifndef _LIMITS_INCLUDED
\#define _LIMITS_INCLUDED
\#include <sys/limits.h>
\#endif /* _LIMITS_INCLUDED */
@@ -557,9 +556,7 @@
files = memory.h;
mach = "*-*-ultrix4.3";
replace =
-'/* @(#)memory.h */
-/* This file was generated by fixincludes */
-\#ifndef _MEMORY_INCLUDED
+'#ifndef _MEMORY_INCLUDED
\#define _MEMORY_INCLUDED
\#include <strings.h>
\#endif /* _MEMORY_INCLUDED */
@@ -577,9 +574,7 @@
files = string.h;
mach = "*-*-ultrix4.3";
replace =
-'/* @(#)string.h */
-/* This file was generated by fixincludes */
-\#ifndef _STRING_INCLUDED
+'#ifndef _STRING_INCLUDED
\#define _STRING_INCLUDED
\#include <strings.h>
\#endif /* _STRING_INCLUDED */
@@ -1035,7 +1030,8 @@
c_fix = format;
c_fix_arg = "%0\n#include <sys/djtypes.h>";
c_fix_arg = "#include <stddef.h>";
- test_text = "__DJ_wint_t\n#undef __DJ_wint_t\n#define __DJ_wint_t";
+ test_text = "#include <stddef.h>\n"
+ "extern __DJ_wint_t x;\n";
};
/*
@@ -1350,6 +1346,8 @@
select = '(printf\(.*), /\* va_list \*/ char \*';
c_fix = format;
c_fix_arg = "%1, __gnuc_va_list";
+ test_text =
+ "extern int printf( const char *, /* va_list */ char * );";
};
@@ -1358,11 +1356,11 @@
*/
fix = {
hackname = irix_limits_const;
- files = limits.h;
+ files = fixinc-test-limits.h, limits.h;
select = "^extern const ";
c_fix = format;
c_fix_arg = "extern __const ";
- test_text = "extern const char limit; /* test\n\tlimits */";
+ test_text = "extern const char limit; /* test limits */";
};
@@ -1994,7 +1992,8 @@
"#if __STDC__ == 0\n"
"#if __STDC__ != 1\n"
"#if __STDC__ - 0 == 0"
- "/* not std C */\nint foo;\n#endif";
+ "/* not std C */\nint foo;\n"
+ "\n#end-end-end-end-if :-)";
};
/*
@@ -2003,12 +2002,7 @@
*/
fix = {
hackname = strict_ansi_not_ctd;
- files="limits.h";
- files="math.h";
- files="stdio.h";
- files="signal.h";
- files="stdlib.h";
- files="time.h";
+ files = math.h, limits.h, stdio.h, signal.h, stdlib.h, time.h;
select = "^([ \t]*[|&][|&][ \t(]*)"
"(__STDC__[ \t]*-[ \t]*0[ \t]*==[ \t]*0"
")(.*)";
@@ -2073,7 +2067,9 @@
c_fix = format;
c_fix_arg = "%1, {0}}";
c_fix_arg = "(define[ \t]+PTHREAD_MUTEX_INITIALIZER.*),[ \t]*0}$";
- test_text = "#define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, 0}";
+ test_text =
+ '#ident "@(#)pthread.h 1.26 98/04/12 SMI"'"\n"
+ "#define PTHREAD_MUTEX_INITIALIZER {{{0},0}, {{{0}}}, 0}";
};
Index: fixtests.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/fixtests.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -u -r1.25 -r1.26
--- fixtests.c 2001/05/25 21:36:08 1.25
+++ fixtests.c 2001/05/26 17:27:10 1.26
@@ -120,7 +120,7 @@
TEST_FOR_FIX_PROC_HEAD( stdc_0_in_system_headers_test )
{
#ifdef STDC_0_IN_SYSTEM_HEADERS
- return SKIP_FIX;
+ return (pz_machine == NULL) ? APPLY_FIX : SKIP_FIX;
#else
return APPLY_FIX;
#endif
More information about the Gcc-patches
mailing list