Re: Recent fixinc cabs addition breaks sunos4 + fix

["Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>]

 > From: Bruce Korb <bkorb@sco.COM>
 > 
 > "Kaveh R. Ghazi" wrote:
 > > 
 > > Okay I installed the following patch and regenerated fixincl.x.
 > > 
 > > I'm not sure whether I need to update anything else when adding
 > > test_text (e.g. check.diff.)  It looks like I should simply move the
 > > NEWDIFF file to check.diff, but the current differences between
 > > NEWDIFF and check.diff include more than my cabs stuff so I left it
 > > alone.
 > 
 > :-(
 > 
 > > What's the proper procedure?
 > 
 > That is still being worked on  :-).
 > I think it should be, approximately:
 > 
 > 1.  run the fixinc "make check" without the test_text changes.
 >     If there are problems reported, then I'll likely have to
 >     look at them.
 > 2.  Make your test_text changes and re-run the "make check".
 >     There *will* be differences.
 > 3.  If:
 >     a) step 1 was clean, AND
 >     b) the differences look correct,
 >     then just install the NEWDIFF file as "check.diff".
 >     Otherwise, I'll just work the new diffs in when I fix #1 above.
 > 
 > At this point, don't bother with step 1.  Just tell me
 > what diffs were reported that did not relate to the cabs stuff?
 > 
 > Thanks,
 > 	Bruce

Here's the "make check" output on solaris2.7 from last night's CVS
before I inserted my cabs fix.  Is it possible for me to see failures
that you don't see?  (I thought the test_text stuff was platform
independent.)

BTW, does the diff output format depend on the particular diff utility
used?  E.g. some vendor diff's might output slightly different, maybe
WRT whitespace.  (I used gnu diff 2.7, you might want to add machinery
to enforce gnu diff of some minimum version number.)

		--Kaveh

autogen -T ../../../egcs-CVS20000517/gcc/fixinc/check.tpl ../../../egcs-CVS20000517/gcc/fixinc/inclhack.def
/bin/sh ./check.sh
No test for m88k_multi_incl in inc/time.h
No test for machine_ansi_h_va_list in inc/machine/ansi.h
No test for math_huge_val_from_dbl_max in inc/math.h
No test for math_huge_val_ifndef in inc/math/math.h
No test for nested_motorola in inc/limits.h
No test for nested_ultrix in inc/rpc/svc.h
No test for news_os_recursion in inc/stdlib.h
No test for next_math_prefix in inc/ansi/math.h
No test for next_template in inc/bsd/libc.h
No test for next_volitile in inc/ansi/stdlib.h
No test for next_wait_union in inc/sys/wait.h
No test for nodeent_syntax in inc/netdnet/dnetdb.h
No test for osf_namespace_a in inc/reg_types.h
No test for osf_namespace_b in inc/regex.h
No test for pthread_page_size in inc/pthread.h
No test for read_ret_type in inc/stdio.h
No test for rs6000_double in inc/math.h
No test for rs6000_fchmod in inc/sys/stat.h
No test for rs6000_param in inc/stdio.h
No test for sco_static_func in inc/sys/stat.h
No test for sco_strict_ansi in inc/testing.h
No test for sco_utime in inc/sys/times.h
No test for sony_include in inc/machine/machparam.h
No test for statsswtch in inc/rpcsvc/rstat.h
No test for stdio_va_list in inc/stdio.h
No test for sun_auth_proto in inc/rpc/auth.h
No test for sun_bogus_ifdef in inc/hsfs/hsfs_spec.h
No test for sun_bogus_ifdef_sun4c in inc/hsfs/hsnode.h
No test for sun_catmacro in inc/pixrect/memvar.h
No test for sun_malloc in inc/malloc.h
No test for sun_rusers_semi in inc/rpcsvc/rusers.h
No test for sun_signal in inc/sys/signal.h
No test for sunos_matherr_decl in inc/math.h
No test for sunos_strlen in inc/strings.h
No test for svr4_getcwd in inc/stdlib.h
No test for svr4_profil in inc/stdlib.h
No test for systypes in inc/sys/types.h
No test for systypes_stdlib_size_t in inc/sys/types.h
No test for sysv68_string in inc/string.h
No test for sysz_stdlib_for_sun in inc/stdlib.h
No test for sysz_stdtypes_for_sun in inc/sys/stdtypes.h
No test for tinfo_cplusplus in inc/tinfo.h
No test for ultrix_atof_param in inc/math.h
No test for ultrix_const in inc/stdio.h
No test for ultrix_fix_fixproto in inc/sys/utsname.h
No test for ultrix_ifdef in inc/sys/file.h
No test for ultrix_static in inc/machine/cpu.h
No test for unixware7_byteorder_fix in inc/arpa/inet.h
No test for va_i960_macro in inc/arch/i960/archI960.h
No test for void_null in inc/curses.h
No test for vxworks_gcc_problem in inc/types/vxTypesBase.h
No test for vxworks_needs_vxworks in inc/sys/stat.h
No test for vxworks_time in inc/time.h
Fixed:  X11/Intrinsic.h
Fixed:  X11/ShellP.h
Fixed:  X11/Xmu.h
Fixed:  Xm/BaseClassI.h
Fixed:  Xm/Traversal.h
Fixed:  assert.h
Fixed:  c_asm.h
Fixed:  curses.h
Fixed:  fcntl.h
Fixed:  inttypes.h
Fixed:  libgen.h
Fixed:  limits.h
Fixed:  math.h
Fixed:  netinet/ip.h
Fixed:  rpc/auth.h
Fixed:  rpc/rpc.h
Fixed:  rpc/xdr.h
Fixed:  sparc/asm_linkage.h
Fixed:  stdio.h
Fixed:  stdlib.h
Fixed:  sundev/vuid_event.h
Fixed:  sunwindow/win_lock.h
Fixed:  sym.h
Fixed:  sys/asm.h
Fixed:  sys/file.h
Fixed:  sys/limits.h
Fixed:  sys/mman.h
Fixed:  sys/param.h
Fixed:  sys/signal.h
Fixed:  sys/spinlock.h
Fixed:  sys/stat.h
Fixed:  sys/time.h
Fixed:  sys/types.h
Fixed:  sys/wait.h
Fixed:  testing.h
NOTE: server restarted
Fixed:  time.h
Fixed:  unistd.h

Test output check:
                    machine_name test failed.  See testdir/inc/testing.h

diff of diffs:
25c25
< + char *c_class;
---
> + 	char *c_class;
77c77
< + Widget	old, c_new;
---
> + 	Widget	old, c_new;
231c231
< *** 1,42 ****
---
> *** 1,35 ****
248,254d247
<   #ifndef HPUX11_FABSF_CHECK
<   #ifdef _PA_RISC
<   #  define fabsf(x) ((float)fabs((double)(float)(x)))
<   #endif
<   #endif  /* HPUX11_FABSF_CHECK */
<   
<   
274c267
< --- 1,65 ----
---
> --- 1,56 ----
295,303d287
<   #ifndef HPUX11_FABSF_CHECK
<   #ifdef _PA_RISC
< + #ifndef __cplusplus
<   #  define fabsf(x) ((float)fabs((double)(float)(x)))
<   #endif
< + #endif
<   #endif  /* HPUX11_FABSF_CHECK */
<   
<   
720c704
< *** 1,22 ****
---
> *** 1,33 ****
743c727,738
< --- 1,22 ----
---
>   #ifndef MACHINE_NAME_CHECK
> ! #ifdef i386 /* no uniform machine_name test, so
>                  this only works on i?86 machines */
>   #endif  /* MACHINE_NAME_CHECK */
>   
>   
>   #ifndef UNDEFINE_NULL_CHECK
>   #define NULL 0UL
>   #define NULL	((void*)0)
>   
>   #endif  /* UNDEFINE_NULL_CHECK */
> --- 1,37 ----
766,768c761,764
< ***************
< *** 27,33 ****
< --- 27,37 ----
---
>   #ifndef MACHINE_NAME_CHECK
> ! #ifdef __i386__ /* no uniform machine_name test, so
>                  this only works on i?86 machines */
>   #endif  /* MACHINE_NAME_CHECK */

Results do not match expectations

make: *** [check] Error 1