Merged this branch with the one in the splint.sf.net repository.

[splint.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index de41dde1597e40358e9e1bfca515f5f717dd8baa..828b3e55280010305d4d5ee79ceb3fff95a60b79 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -118,9 +118,9 @@ SPLINTRNEST = $(SPLINTRNNEST) -exportlocal +debugfcnconstraint
 UNITTESTS = \
   help \
   abstptr abstract alias alttypes ansireserved argorder \
-  args arraydims arrayinit arraylit blocks break cases cast chararraylit charlit clauses commentchar compdestroy \
+  args arraydims arrayinit arraylit blocks break cases cast charlit clauses commentchar compdestroy \
   compoundliterals compoundstmt constannot controldepth csyntax czechnames czechoslovaknames deadparam \
-  decl divzero enum enumtag exports external fields flags forbody format freearray \
+  decl divzero enum exports external fields flags forbody format freearray \
   funcpointer functionmacro glob globals impabstract info init inparam internal iter keep libs \
   linked lintcomments list loopexec looptesteffect \
   macros macrosef merge mergenull modifies modtest moduncon \
@@ -160,7 +160,7 @@ CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^mak
 #         $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.expect; \
 #         cat $$TEST.expect; \
 #       done
-CheckSystemDir = (pwd | grep -q  "/usr" && echo "Warning tests which not run correctly when splint is built in /usr or a subdirectory under /usr.  Build splint in a different directory or disregard test failures." )
+CheckSystemDir = pwd | grep -q  "/usr" && echo "Warning tests which not run correctly when splint is built in /usr or a subdirectory under /usr.  Build splint in a different directory or disregard test failures." 
 
 #drl 11/29/2001 This is a very ugly hack to get make dist to work
 EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
@@ -299,7 +299,6 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./cases2.c \
               ./cast.c \
               ./cast2.c \
-              ./chararraylit.c \
               ./charlit.c \
               ./clauses.c \
               ./clauses2.c \
@@ -338,7 +337,6 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./dkf5kSprintf.c \
               ./ensures.c \
               ./enum.c \
-              ./enumtag.c \
               ./exports.c \
               ./external.c \
               ./fields.c \
@@ -619,7 +617,6 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               buffertest.expect \
               cases.expect \
               cast.expect \
-              chararraylit.expect \
               charlit.expect \
               clauses.expect \
               commentchar.expect \
@@ -635,7 +632,6 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               deadparam.expect \
               decl.expect \
               enum.expect \
-              enumtag.expect \
               exports.expect \
               external.expect \
               fields.expect \
@@ -930,24 +926,24 @@ all check: fulltest
 
 .PHONY: version
 version:
-       -$(SPLINT) -help version
+       -$(SPLINTP) -help version
 
 .PHONY: help
 
 help:
        -@$(SPLINT)
        -@LARCH_PATH=/dev/null; $(SPLINT) -nof empty.lcl
-       -@$(SPLINT) -help
+       -@$(SPLINTP) -help
        -@$(SPLINTP) -asdf
        -@$(SPLINTP) +boolint +boolint 
-       -@$(SPLINT) -help flags alpha
+       -@$(SPLINTP) -help flags alpha
 
 #commenting these out for the release because they will almost always fail
 #since the default will only fit one system
 #Don't want to panic the user... 
-#      -@$(SPLINT) -help flags all     | $(GREP) -v "^larchpath <path> "     | $(GREP) -v "^lclimportdir <directory> " | $(GREP) -v "  Path argument.  Default: " |  $(GREP) -v "  Directory argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
-#      -@$(SPLINT) -help flags full    | $(GREP) -v "^larchpath <path> "     | $(GREP) -v "^lclimportdir <directory> " | $(GREP) -v "  Path argument.  Default: " |  $(GREP) -v "  Directory argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
-#      -@$(SPLINT) -help flags manual     | $(GREP) -v "^larchpath <path> "   | $(GREP) -v "^lclimportdir <directory> " | $(GREP) -v "  Path argument.  Default: " |  $(GREP) -v "  Directory argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+#      -@$(SPLINTP) -help flags all     | $(GREP) -v "^larchpath <path> "     | $(GREP) -v "^lclimportdir <directory> " | $(GREP) -v "  Path argument.  Default: " |  $(GREP) -v "  Directory argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+#      -@$(SPLINTP) -help flags full    | $(GREP) -v "^larchpath <path> "     | $(GREP) -v "^lclimportdir <directory> " | $(GREP) -v "  Path argument.  Default: " |  $(GREP) -v "  Directory argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
+#      -@$(SPLINTP) -help flags manual     | $(GREP) -v "^larchpath <path> "   | $(GREP) -v "^lclimportdir <directory> " | $(GREP) -v "  Path argument.  Default: " |  $(GREP) -v "  Directory argument.  Default: " | $(GREP) -v "  lclimportdir <directory> "
 
 #larch and lclimportdir have different hardcoded default paths so don't include the path in the output..
 
@@ -969,9 +965,11 @@ $(SPLINT):
 .c.diff:
        $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
 
+WarnSysDir:
+       $(CheckSystemDir)
+
 .PHONY: quicktest
-quicktest:
-       $(CheckSystemDir)       
+quicktest: WarnSysDir  
        @for TEST in $(QUICKTESTS); do \
           echo "Checking $$TEST..."; \
           $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.out && \
@@ -984,8 +982,8 @@ fulltest:
        @echo "Testing $(PACKAGE) $(VERSION)..."
        @echo
        @echo "Version Info:"
-       @$(SPLINT) -help version
-       @$(SPLINT) -help vars
+       @$(SPLINTP) -help version
+       @$(SPLINTP) -help vars
        @echo ""
        @echo "Tests:"
        @echo ""
@@ -1090,10 +1088,6 @@ cast:
        -$(SPLINTR) cast -accessmodule -expect 20
        -$(SPLINTRN) cast2.c +checks -exportlocal -exportheader -expect 3
 
-.PHONY: chararraylit
-chararraylit:
-       -$(SPLINTR) chararraylit.c -expect 2
-
 ### Two addition errors detected with 2.5 with -numliteral.
 
 .PHONY: charlit
@@ -1199,10 +1193,6 @@ enum:
        -$(SPLINTR) enum -expect 16
        -$(SPLINTR) enum -misscase -expect 14
 
-.PHONY: enumtag
-enumtag:
-       -$(SPLINTR) enumtag.c -expect 2
-
 .PHONY: exports
 exports:
        -$(SPLINTR) exports.c +exporttype +exportvar +exportfcn +topuse +typeuse -expect 6
@@ -1317,14 +1307,13 @@ keep:
 ### libs
 ### 2001-05-22: 2 new errors found (fixed spec of signal)
 ### 2001-05-30: 3 new errors found (formatconst)
-### 2002-07-08: 2 new errors found (getc modifies errno)
 
 .PHONY: libs
 libs:
        -$(SPLINTR) libs.c +longunsignedunsignedintegral -expect 18
        -$(SPLINTR) libs.c -expect 22
        -$(SPLINTR) libs.c +globunspec +modunspec -expect 25
-       -$(SPLINTR) libs.c +strictlib +globunspec +modunspec -expect 44
+       -$(SPLINTR) libs.c +strictlib +globunspec +modunspec -expect 42
 
 .PHONY: lintcomments
 lintcomments:
@@ -1684,12 +1673,10 @@ ullint:
 ###
 ### 2001-12-30: Poor warnings reported by Peter Deutsch
 ###
-### 2002-07-03: removed warnings for datatype/macro definitions
-###
 
 .PHONY: utypes
 utypes:
-       ${SPLINTRN} utypes.c -expect 2
+       ${SPLINTRN} utypes.c -expect 6
 
 ###