X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/b9904f57dcee356ee752dd80154067720d142228..b7e846050a7dacd97326b1c38d2dd417569b0ce8:/test/Makefile

diff --git a/test/Makefile b/test/Makefile
index bed631c..68fba48 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -21,7 +21,7 @@
 .PHONY: tainted typequals ud ulstypes union unreachable unused ullint void
 .PHONY: db1 db2 db3 tests2.2 tests2.2a tests2.4 tests2.5
 .PHONY: all test fulltest expects quicktest
-.PHONY: metastate warnuse
+.PHONY: warnuse metastate
 .PHONY: linked freearray
 .PHONY: sizeoftest
 .PHONY: bufferTest
@@ -37,23 +37,36 @@
 SHELL = /bin/csh -f
 
 # Command to run lclint
-LCLINT  = ${HOME}/LCLintDev/src/lclint
+# ${HOME}/LCLintDev/src/lclint
+LCLINT  = lclint
 LCLINTP = $(LCLINT)
 
 # Make sure .lclintrc files are not used so test results do not
 # depend on local settings.
 LCLINTRN = $(LCLINTP) -nof -hints -booltype "bool"
-LCLINTR = $(LCLINTRN) -exportlocal +debugfcnconstraint
-
-UNITTESTS = help sizeoftest bufferTest simplebufferConstraintTests  moreBufferTests globalbufferannotation maxset strchr for abstptr abstract alias alttypes ansireserved argorder args blocks break cases cast \
-   charlit clauses commentchar compdestroy constannot controldepth csyntax czechnames czechoslovaknames deadparam \
-   decl enum exports external fields fileio flags forbody format freearray funcpointer glob globals impabstract \
-   init inparam internal iter keep libs linked lintcomments list macros macrosef merge mergestate metastate modifies \
-   modtest moduncon mongoincludes mystrncat noeffect null nullret nullassign observer oldstyle \
-   outglob outparam preds prefixes \
-   printflike rc refcounts release repexpose returned sharing slovaknames specclauses special stack \
-   staticarray strings structassign tainted typequals ud ulstypes union unreachable unused ullint void warnuse \
-   tests2.2 tests2.2a tests2.4 tests2.5 
+LCLINTR = $(LCLINTRN) -exportlocal   +debugfcnconstraint
+
+UNITTESTS = \
+  fileio tainted mergestate nullret nullassign warnuse metastate \
+  help sizeoftest bufferTest simplebufferConstraintTests \
+  moreBufferTests globalbufferannotation maxset strchr for \
+  abstptr abstract alias alttypes ansireserved argorder args blocks break cases cast \
+  charlit clauses commentchar compdestroy constannot controldepth csyntax czechnames czechoslovaknames deadparam \
+  decl enum exports external fields flags forbody format freearray funcpointer glob globals impabstract \
+  init inparam internal iter keep libs linked lintcomments list macros macrosef merge modifies \
+  modtest moduncon mongoincludes mystrncat noeffect null observer oldstyle \
+  outglob outparam preds prefixes \
+  printflike rc refcounts release repexpose returned sharing slovaknames specclauses special stack \
+  staticarray strings structassign \
+  typequals ud ulstypes union unreachable unused ullint void \
+  tests2.2 tests2.2a tests2.4 tests2.5 
+
+###
+### Attribute checking is not ready for the 3.0.0.9 alpha release:
+###
+
+#drl removed the following tests
+#fileio tainted mergestate nullret nullassign warnuse metastate \
 
 UNITEXPECTS  = $(addsuffix .expect, $(UNITTESTS))
 
@@ -69,7 +82,12 @@ test: fulltest
 
 GREP = grep
 DIFF = diff
-CLEANOUTPUT = $(GREP) -v "LCLint 3." | $(GREP) -v "make -e" | $(GREP) -v "make\[" | $(GREP) -v "lclint -nof" | $(GREP) -v "make  -e"
+
+###
+### This is a kludgey way of processing the output to make it match exactly
+###
+
+CLEANOUTPUT = $(GREP) -v "LCLint 3." | $(GREP) -v "make -e" | $(GREP) -v "make\[" | $(GREP) -v "lclint -nof" | $(GREP) -v "make  -e" | $(GREP) -v $(HOME)
 
 ### not real .c
 
@@ -237,7 +255,7 @@ compdestroy:
 	$(LCLINTRN) compdestroy.c +strict +partial -exportheader -expect 3
 
 constannot:
-	${LCLINTRN} constannot.c +arraybounds -exportlocal -expect 2
+	${LCLINTRN} constannot.c +arraybounds  -exportlocal -expect 2
 
 csyntax:
 	$(LCLINTR) +quiet -incondefs csyntax.c -expect 1 
@@ -424,10 +442,10 @@ mongoincludes:
 	$(LCLINTR) mongoincludes.c -includenest 5 -expect 0
 
 mystrncat:
-	$(LCLINTR) mystrncat.c +arraybounds +arrayboundsread -expect 4 
+	$(LCLINTR) mystrncat.c +arraybounds  +arrayboundsread -expect 4 
 
 noeffect:
-	${LCLINT} noeffect.c +allmacros +checks -expect 3
+	${LCLINT} -nof noeffect.c +allmacros +checks -expect 3
 
 null: 
 	$(LCLINTR) null1.c -expect 14
@@ -654,37 +672,36 @@ tests2.4:
 
 sizeoftest:
 	@cd sizeoftest; \
-	$(LCLINTR) +arraybounds +arrayboundsread sizeof.c
+	$(LCLINTR) +arraybounds  +arrayboundsread sizeof.c
 
 bufferTest:
 	@cd bufferTest; \
-	$(LCLINTR) +arraybounds +arrayboundsread test4.c test6.c
+	$(LCLINTR) +arraybounds  +arrayboundsread test4.c test6.c
 
 simplebufferConstraintTests:
 	@cd simplebufferConstraintTests; \
-	$(LCLINTR) +arraybounds +arrayboundsread m.c  sizeof.c  test3.c  test7.c
+	$(LCLINTR) +arraybounds  +arrayboundsread m.c  sizeof.c  test3.c  test7.c
 
 moreBufferTests:
 	@cd moreBufferTests; \
-	$(LCLINTR) +arraybounds +arrayboundsread +orconstraint unrecogCall.c strrchr.c initialization.c simplifyTest.c strncatNotReallyGood.c strncatReallyGood.c
+	$(LCLINTR) +arraybounds  +arrayboundsread  unrecogCall.c strrchr.c initialization.c simplifyTest.c strncatNotReallyGood.c strncatReallyGood.c
 
 maxset:
 	@cd maxset; \
-	$(LCLINTR) -f .lclintrc -booltype "lltX_bool" maxsetannotations.c; \
-	echo $(LCLINTR); \
-	$(LCLINTR) -f .lclintrc -booltype "lltX_bool"  maxsetnoannotations.c
+	$(LCLINTR) +arraybounds maxsetannotations.c; \
+	$(LCLINTR) +arraybounds maxsetnoannotations.c -expect 1
 
 globalbufferannotation:
 	@cd globalbufferannotation; \
-	$(LCLINTR) +arraybounds +arrayboundsread globalvariable.c
+	$(LCLINTR) +arraybounds  +arrayboundsread globalvariable.c
 
 strchr:
 	@cd strchr; \
-	$(LCLINTR)  +arraybounds +arrayboundsread  strchr.c
+	$(LCLINTR) +arraybounds +arrayboundsread  strchr.c -expect 2
 
 for:
 	@cd for; \
-	$(LCLINTR)  +arraybounds +arrayboundsread  for.c
+	$(LCLINTR)  +arraybounds  +arrayboundsread  for.c
 
 tests2.5:
 	setenv LCLINT '$(LCLINTRN)'; cd tests2.5 ; $(MAKE) -e