diff options
| author | Bruce Korb <bkorb@gnu.org> | 2000-06-17 17:50:12 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2000-06-17 17:50:12 +0000 |
| commit | 33002945c162325d7421a4627b8b54ae5c008183 (patch) | |
| tree | c4d479fcb39712fc8602a0cdb162c1e29c5628ae /gcc | |
| parent | c19bd6c073e5c64cc1921c6a2f07f7682758682c (diff) | |
| download | gcc-33002945c162325d7421a4627b8b54ae5c008183.zip gcc-33002945c162325d7421a4627b8b54ae5c008183.tar.gz gcc-33002945c162325d7421a4627b8b54ae5c008183.tar.bz2 | |
finish the implementation of multiple tests per fix
From-SVN: r34581
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fixinc/check.tpl | 6 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 11 |
3 files changed, 20 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 60268df..2e3a3e8 100644 --- 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 --- 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 --- 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 = { |