Fixes after removing -unrecogcomments flag for make splintme.

[splint.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index 54e0891b60fe37df6f4567c1348b6101f64f5656..79e5c88a1a51cd4b347f50e112b1593570790484 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -133,9 +133,9 @@ UNITTESTS = \
   compoundliterals compoundstmt constannot controldepth csyntax czechnames czechoslovaknames deadparam \
   decl divzero enum enumtag exports external fields flags forbody format freearray \
   funcpointer functionmacro glob globals impabstract info init inparam internal iter keep libs \
-  linked lintcomments list loopexec looptesteffect \
+  linked lintcomments list longint loopexec looptesteffect \
   macros macrosef merge mergenull modifies modtest moduncon \
-  mongoincludes mystrncat noeffect null observer oldstyle outglob outparam \
+  mongoincludes mystrncat noeffect null nullret nullassign numabstract observer oldstyle outglob outparam \
   parentype postnotnull preds prefixes printflike rc refcounts release repexpose \
   returned sharing shifts sizesigns slovaknames \
   specclauses \
@@ -161,6 +161,15 @@ QUICKTESTS = db3
 CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^make.*\[[1-9]*\]:" | $(GREP) -v "^gmake.*\[[1-9]*\]:" |   $(GREP) -v "^gmake -e" |  $(GREP) -v "^make -e" |$(GREP) -v "config.status: creating test/Makefile" | $(GREP) -v "cd .. && " | $(GREP) -v "CONFIG_HEADERS=" | $(GREP) -v "CONFIG_FILES="
 
 
+#drl 12/07/2002 These rules for .c and .expect files don't make sense
+# and they are confusing make dist so I'm taking them out.
+
+#.c.expect:
+#      $(MAKE) $* |& $(CLEANOUTPUT) >$*.expect && cat $*.expect
+#
+#.c.diff:
+#      $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
+
 #drl temporally take this out.
 #.PHONY: expects
 #expects:
@@ -231,6 +240,9 @@ EXTRA_DIST = ./abst_t.lcl \
               ./db3/erc.lcl \
               ./db3/eref.lcl \
               ./db3/ereftab.lcl \
+              ./db3/README \
+              ./db3/clean \
+              ./db3/tidy \
               ./tq.lcl \
               ./ud2.lcl \
               ./for/.splintrc \
@@ -467,8 +479,8 @@ EXTRA_DIST = ./abst_t.lcl \
               ./simplebufferConstraintTests/test3.c \
               ./simplebufferConstraintTests/test7.c \
               ./sizeoftest/sizeof.c \
-              ./sizeoftest/Makefile.c \
               ./sizeoftest/sizeofConst.c \
+              ./sizeoftest/Makefile \
               ./strchr/strchr.c \
               ./suppressfile/test.c \
               ./tainted/sprintf.c \
@@ -741,7 +753,7 @@ EXTRA_DIST = ./abst_t.lcl \
               ./tests2.5/immutable.h \
               ./tests2.5/impabsmodule.h \
               ./tests2.5/socket.h \
-              ./Makefile-test.os2 \
+              ./Makefile.os2 \
               ./db1/Makefile \
               ./db2/Makefile \
               ./db3/Makefile \
@@ -772,15 +784,17 @@ EXTRA_DIST = ./abst_t.lcl \
                 unioninit.expect  unioninit.c utypes.c \
                 utypes.expect widestrings.expect  widestrings.c  \
                 functionmacro.expect functionmacro.c  info.c info.expect \
-                loopexec.c looptesteffect.c mergenull.c shifts.c \
-               sizesigns.c sizesigns.expect \
+                longint.c loopexec.c looptesteffect.c mergenull.c shifts.c \
+               longint.expect nullret.expect numabstract.expect \
+               sizesigns.expect typeof.expect \
                 manual.expect ./manual/Makefile \
                 ./manual/annotglobs.c  ./manual/bool.c  ./manual/bool.h  ./manual/clauses.c  ./manual/employee.h  ./manual/exposure.c  ./manual/globals.c  ./manual/ignore.c  ./manual/implicit.c  ./manual/intSet.h  ./manual/list.c  ./manual/loop.c  ./manual/macros.c  ./manual/modify.c  ./manual/mstring.c  ./manual/mstring.h  ./manual/mstringnn.c  ./manual/multiError.c  ./manual/names.c  ./manual/noeffect.c  ./manual/null.c  ./manual/only.c  ./manual/order.c  ./manual/palindrome.c  ./manual/palindrome.h  ./manual/refs.c  ./manual/returned.c  ./manual/rgb.c  ./manual/rstring.c  ./manual/rstring.h  ./manual/sample.c  ./manual/setChar.c  ./manual/setname.c  ./manual/setname.h  ./manual/special.c  ./manual/stack.c  ./manual/sumsquares.c  ./manual/switch.c  ./manual/testpal.c  ./manual/types.c  ./manual/unique.c  ./manual/usedef.c  ./manual/bounds.c \
                   arraydims.expect arraydims.c \
                   moreBufferTests2/fixedArrayType.c oldstyle2.c \
                   divzero.expect parentype.expect \
                   divzero.c parentype.c \
-stringliteral.expect  stringliteral.c
+stringliteral.expect  stringliteral.c \
+  numabstract.c sizesigns.c typeof.c   nullassign.expect 
 
 subdir = test
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -791,7 +805,6 @@ DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .diff .expect
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --foreign  test/Makefile
@@ -914,7 +927,6 @@ version:
 
 help:
        -@$(SPLINT)
-       -@LARCH_PATH=/dev/null; $(SPLINT) -nof empty.lcl
        -@$(SPLINT) -help
        -@$(SPLINTP) -asdf
        -@$(SPLINTP) +boolint +boolint 
@@ -943,12 +955,6 @@ $(SPLINTTESTS): $(SPLINT)
 $(SPLINT):
        cd $(top_builddir)/src; $(MAKE)
 
-.c.expect:
-       $(MAKE) $* |& $(CLEANOUTPUT) >$*.expect && cat $*.expect
-
-.c.diff:
-       $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
-
 .PHONY: quicktest
 quicktest:
        $(CheckSystemDir)       
@@ -1076,11 +1082,12 @@ chararraylit:
 
 ### Two addition errors detected with 2.5 with -numliteral.
 
+### evans 2002-12-15: finds one more but in charlit
 .PHONY: charlit
 charlit:
        -$(SPLINTR) +hints charlit.c -expect 4
        -$(SPLINTR) +hints -numliteral charlit.c -expect 6
-       -$(SPLINTR) +hints charlit.c +charintliteral +ignoresigns
+       -$(SPLINTR) +hints charlit.c +charintliteral +ignoresigns -expect 1
 
 .PHONY: clauses
 clauses: 
@@ -1316,6 +1323,17 @@ lintcomments:
 list:
        -$(SPLINTR) list.c -expect 3
 
+###
+### 2002-12-12: Added test case for +longint and +shortint flags
+###
+
+.PHONY: longint
+longint:
+       -$(SPLINTR) longint.c -expect 3
+       -$(SPLINTR) longint.c +longint -expect 2
+       -$(SPLINTR) longint.c +shortint -expect 2
+       -$(SPLINTR) longint.c +shortint +longint -expect 0
+
 ###
 ### 2002-01-01: Added test case for obvious loop execution.
 ###
@@ -1391,7 +1409,7 @@ null:
        -$(SPLINTR) null1.c -null -mustdefine -expect 4
        -$(SPLINTR) null2.c -expect 11
        -$(SPLINTR) null3.c -expect 15
-       -$(SPLINTR) null3.c -warnunixlib +unixlib -expect 16
+       -$(SPLINTR) null3.c +unixlib -expect 16
        -$(SPLINTR) null4.c -expect 1
        -$(SPLINTR) null5.c -expect 4
        -$(SPLINTR) null6 -expect 4
@@ -1403,13 +1421,21 @@ null:
 .PHONY: nullret
 nullret:
        -$(SPLINTR) nullret.c -expect 2
-       -$(SPLINTR) -nullret nullret.c -expect 1
+       -$(SPLINTR) -nullret nullret.c -expect 0
 
 .PHONY: nullassign
 nullassign:
        -$(SPLINTR) nullassign.c -expect 2
        -$(SPLINTR) -nullassign nullassign.c -expect 1
 
+### Added for 3.1 - evans 2002-12-14
+
+.PHONY: numabstract
+numabstract:
+       -$(SPLINTR) numabstract.c -expect 11
+       -$(SPLINTR) numabstract.c +numabstractlit -expect 9
+       -$(SPLINTR) numabstract.c -numabstractcast -expect 10
+
 #
 # Before 2.4, expected one more because error was reported both as 
 # dependent and observer.
@@ -1452,7 +1478,7 @@ parentype:
 preds:
        -$(SPLINTR) +hints preds.c -expect 6
        -$(SPLINTRN) +hints preds.c -weak -expect 1
-       -$(SPLINTRN) +hints preds.c -strict -exportlocal -exportheader -expect 12
+       -$(SPLINTRN) +hints preds.c -strict -exportlocal -exportheader -expect 10
 
 .PHONY: prefixes
 prefixes:
@@ -1525,12 +1551,12 @@ shifts:
        -$(SPLINTR) shifts.c -shiftimplementation -expect 3
        -$(SPLINTR) shifts.c -shiftnegative -expect 1
 
+#drl comment this out until sizesigns is added to cvs
+
 ### evans - added 2002-08-17: check warnings with arbitrary integral types
 sizesigns:
-       -$(SPLINTR) +strict sizesigns.c
-       -$(SPLINTR) +strict +ignoresigns sizesigns.c
-       -$(SPLINTR) +strict +matcharbitraryintegral sizesigns.c
-       -$(SPLINTR) +strict +matcharbitraryintegral +ignoresignz sizesigns.c
+       -$(SPLINTR) +strict sizesigns.c -expect 5
+       -$(SPLINTR) +strict +matchanyintegral sizesigns.c -expect 4
 
 .PHONY: slovaknames
 slovaknames:
@@ -1720,6 +1746,8 @@ buffertest:
 .PHONY: $(SUBDIRTESTS)
 $(SUBDIRTESTS):
        cd $@; $(MAKE) SPLINT="$(SPLINTRNNEST)"
+
+#              sizesigns.c sizesigns.expect \
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: