finish the implementation of multiple tests per fix

From-SVN: r34581

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60268df..2e3a3e8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+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
+
 Sat Jun 17 10:33:59 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
        * gcc.texi: Remove reference to stupid.c.

diff --git a/gcc/fixinc/check.tpl b/gcc/fixinc/check.tpl
index 5bc8aa3..4142c43 100644 (file)
--- a/gcc/fixinc/check.tpl
+++ b/gcc/fixinc/check.tpl
@@ -54,10 +54,9 @@ sfile=[=
     _IF files _exist =][=
       files[0] =][=
     _ELSE =]testing.h[=
-    _ENDIF =]
-dfile=`dirname $sfile`/[=hackname "_A-Z" "-a-z" _tr=]-[=_EVAL _index=].h
-fixnum=[=_EVAL _index=][=
+    _ENDIF =][=
     _FOR test_text FROM 1 =]
+dfile=`dirname $sfile`/[=hackname "#_A-Z" "#-a-z" _tr=]-[=_EVAL _index=].h
 cat >> $sfile <<_HACK_EOF_
 
 
@@ -66,6 +65,7 @@ cat >> $sfile <<_HACK_EOF_
 #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 =][=

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 66f59e8..d98bfce 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -891,8 +891,13 @@ fix = {
     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)";
+
+    /*
+     *  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,6 +1154,8 @@ fix = {
     "#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 = {