[patch] fixinc's "make check"

Bruce Korb bkorb@sco.COM
Sat Jun 17 10:48:00 GMT 2000


To properly test some fixes it is necessary to process
multiple different files.  This patch finishes that capability
and uses it.
2000-06-17  Bruce Korb  <bkorb@gnu.org>

	* fixinc/check.tpl:  finish the implementation of multiple tests
	for a single fix
	* fixinc/inclhack.def(ctrl_quotes_def): add a second test
	(io_quotes_def): add a second test
	* fixinc/tests/base/*: update the testing output

Index: check.tpl
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/check.tpl,v
retrieving revision 1.7
diff -c -r1.7 check.tpl
*** check.tpl	2000/05/31 14:44:35	1.7
--- check.tpl	2000/06/17 17:38:25
***************
*** 54,63 ****
      _IF files _exist =][=
        files[0] =][=
      _ELSE =]testing.h[=
!     _ENDIF =]
! dfile=`dirname $sfile`/[=hackname "_A-Z" "-a-z" _tr=]-[=_EVAL _index=].h
! fixnum=[=_EVAL _index=][=
      _FOR test_text FROM 1 =]
  cat >> $sfile <<_HACK_EOF_
  
  
--- 54,62 ----
      _IF files _exist =][=
        files[0] =][=
      _ELSE =]testing.h[=
!     _ENDIF =][=
      _FOR test_text FROM 1 =]
+ dfile=`dirname $sfile`/[=hackname "#_A-Z" "#-a-z" _tr=]-[=_EVAL _index=].h
  cat >> $sfile <<_HACK_EOF_
  
  
***************
*** 66,71 ****
--- 65,71 ----
  #endif  /* [=hackname _up=]_CHECK_[=_EVAL _index=] */
  _HACK_EOF_
  echo $sfile | ../../fixincl
+ mv -f $sfile $dfile
  [ -f ${DESTDIR}/$sfile ] && mv ${DESTDIR}/$sfile ${DESTDIR}/$dfile[=
      /test_text =][=
    _ENDIF =][=
Index: inclhack.def
===================================================================
RCS file: /cvs/gcc/egcs/gcc/fixinc/inclhack.def,v
retrieving revision 1.78
diff -c -r1.78 inclhack.def
*** inclhack.def	2000/06/16 20:38:42	1.78
--- inclhack.def	2000/06/17 17:38:33
***************
*** 891,898 ****
      select    = "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
      c_fix     = char_macro_def;
      c_fix_arg = "CTRL";
      test_text = "#define BSD43_CTRL(n, x) (('n'<<8)+x)\n"
!                 "#define _CTRL(c) ('c'&037)";
  };
  
  fix = {
--- 891,903 ----
      select    = "define[ \t]+[A-Z0-9_]+CTRL\\([a-zA-Z][,)]";
      c_fix     = char_macro_def;
      c_fix_arg = "CTRL";
+ 
+     /*
+      *  This is two tests in order to ensure that the "CTRL(c)" can
+      *  be selected in isolation from the multi-arg format
+      */
      test_text = "#define BSD43_CTRL(n, x) (('n'<<8)+x)\n"
!     test_text = "#define _CTRL(c) ('c'&037)";
  };
  
  fix = {
***************
*** 1149,1154 ****
--- 1154,1161 ----
      "#define BSD43__IOWR(n, x) (('n'<<8)+x)\n"
      "#define _IOWN(x,y,t)  (_IOC_IN|(((t)&_IOCPARM_MASK)<<16)|('x'<<8)|y)\n"
      "#define _IO(x,y)      ('x'<<8|y)";
+     test_text =
+     "#define XX_IO(x)        ('x'<<8|256)";
  };
  
  fix = {


More information about the Gcc-patches mailing list