Hacking Makefile to print a warning when test suite to run under /usr

diff --git a/test/Makefile b/test/Makefile
index 7ed275104509d7046036ee50094b5b51d76c1574..e2a5e50f6f593e1ee9bad1b95739769a21d2b71f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -38,10 +38,10 @@ pkglibdir = $(libdir)/splint
 pkgincludedir = $(includedir)/splint
 top_builddir = ..
 
-ACLOCAL = ${SHELL} /net/af9/drl7x/reTmp/LCLintDev/config/missing --run aclocal
-AUTOCONF = ${SHELL} /net/af9/drl7x/reTmp/LCLintDev/config/missing --run autoconf
-AUTOMAKE = ${SHELL} /net/af9/drl7x/reTmp/LCLintDev/config/missing --run automake
-AUTOHEADER = ${SHELL} /net/af9/drl7x/reTmp/LCLintDev/config/missing --run autoheader
+ACLOCAL = ${SHELL} /af9/drl7x/reTmp/LCLintDev/config/missing --run aclocal
+AUTOCONF = ${SHELL} /af9/drl7x/reTmp/LCLintDev/config/missing --run autoconf
+AUTOMAKE = ${SHELL} /af9/drl7x/reTmp/LCLintDev/config/missing --run automake
+AUTOHEADER = ${SHELL} /af9/drl7x/reTmp/LCLintDev/config/missing --run autoheader
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -61,7 +61,7 @@ host_alias =
 host_triplet = i686-pc-linux-gnu
 target_alias = 
 target_triplet = i686-pc-linux-gnu
-AMTAR = ${SHELL} /net/af9/drl7x/reTmp/LCLintDev/config/missing --run tar
+AMTAR = ${SHELL} /af9/drl7x/reTmp/LCLintDev/config/missing --run tar
 AWK = gawk
 BISON = bison
 CAT = cat
@@ -83,7 +83,7 @@ RM = rm
 VERSION = 3.0.1.7
 am__include = include
 am__quote = 
-install_sh = /net/af9/drl7x/reTmp/LCLintDev/config/install-sh
+install_sh = /af9/drl7x/reTmp/LCLintDev/config/install-sh
 
 AUTOMAKE_OPTIONS = 1.5 foreign
 
@@ -91,8 +91,12 @@ DIFFFLAGS =
 
 
 # -u show context
+
+#drl 3/27/2002 get the test suit to print a warning when splint is built under /usr/
 SPLINT = $(top_builddir)/src/splint$(EXEEXT)
 
+### These are shell-specific
+
 ### This is horrible!  Can't we make top_builddir absolute?
 SPLINTNEST = ../$(top_builddir)/src/splint$(EXEEXT)
 
@@ -114,11 +118,11 @@ SPLINTRNEST = $(SPLINTRNNEST) -exportlocal +debugfcnconstraint
 UNITTESTS = \
   help \
   abstptr abstract alias alttypes ansireserved argorder \
-  args arraydims blocks break cases cast charlit clauses commentchar compdestroy \
-  compoundliterals constannot controldepth csyntax czechnames czechoslovaknames deadparam \
+  args arraydims arrayinit arraylit blocks break cases cast charlit clauses commentchar compdestroy \
+  compoundliterals compoundstmt constannot controldepth csyntax czechnames czechoslovaknames deadparam \
   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 \
+  linked lintcomments list loopexec looptesteffect \
   macros macrosef merge mergenull modifies modtest moduncon \
   mongoincludes mystrncat noeffect null observer oldstyle outglob outparam \
   parentype postnotnull preds prefixes printflike rc refcounts release repexpose \
@@ -126,7 +130,8 @@ UNITTESTS = \
   specclauses \
   special stack staticarray strings \
   stringliteral \
-  structassign typequals ud ulstypes union unioninit unreachable unsignedcompare \
+  structassign typequals typeof ud ulstypes union unioninit \
+  unnamedsu unreachable unsignedcompare \
   unused ullint utypes void widestrings
 
 UNITEXPECTS = $(addsuffix .expect, $(UNITTESTS))
@@ -144,6 +149,19 @@ 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 temporally take this out.
+#.PHONY: expects
+#expects:
+#      @echo "Saving old expects..."; \
+#       cat *.expect >expects-`date +"%y-%m-%d-%H"`
+#      @for TEST in $(UNITTESTS) $(INTEGTESTS); do \
+#         echo "Making $$TEST.expect..."; \
+#         $(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." )
+
 #drl 11/29/2001 This is a very ugly hack to get make dist to work
 EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./abstptr.lcl ./abstptr.lcs \
@@ -272,6 +290,7 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./argorder5.c \
               ./args.c \
               ./arrayinit.c \
+              ./arraylit.c \
               ./blocks.c \
               ./branchstate.c \
               ./break.c \
@@ -287,6 +306,8 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./commentchar.c \
               ./commentcmd.c \
               ./compdestroy.c \
+              ./compoundliterals.c ./compoundliterals.expect \
+              ./compoundstmt.c ./compoundstmt.expect \
               ./csyntax.c \
               ./constannot.c \
               ./controldepth.c \
@@ -424,6 +445,7 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./union.c \
               ./unreachable.c \
               ./unsignedcompare.c \
+              ./unnamedsu.c \
               ./unused.c \
               ./void.c \
               ./conditions/miroslaw.c \
@@ -588,6 +610,7 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               argorder.expect \
               args.expect \
               arrayinit.expect \
+              arraylit.expect \
               blocks.expect \
               branchstate.expect \
               break.expect \
@@ -688,6 +711,7 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ullint.expect \
               ulstypes.expect \
               union.expect \
+              unnamedsu.expect \
               unreachable.expect \
               unsignedcompare.expect \
               unused.expect \
@@ -766,11 +790,11 @@ EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./moreBufferTests2/Makefile \
               ./fileio/eof.mts ./fileio/file.mts ./fileio/filerw.mts ./mergestate/tainted.mts ./mergestate/taintednm.mts ./metastate/file.mts ./metastate/nullterminated.mts ./metastate/sockets.mts ./tainted/tainted-bad.mts ./tainted/tainted.mts ./fileio/file.xh ./fileio/filerw.xh ./mergestate/tainted.xh ./mergestate/taintednm.xh ./metastate/file.xh ./tainted/tainted.xh \
                 db2.old-expect   union.pp warnuse.old-expect \
-               ./tests2.5/badcomment  ./tests2.5/boolbad  ./tests2.5/booltest   ./tests2.5/uconstants  loopexec.expect mergenull.expect shifts.expect \
+               ./tests2.5/badcomment  ./tests2.5/boolbad  ./tests2.5/booltest   ./tests2.5/uconstants  loopexec.expect mergenull.expect shifts.expect looptesteffect.expect \
                 unioninit.expect  unioninit.c utypes.c \
                 utypes.expect widestrings.expect  widestrings.c  \
                 functionmacro.expect functionmacro.c  info.c info.expect \
-                loopexec.c mergenull.c shifts.c \
+                loopexec.c looptesteffect.c mergenull.c shifts.c \
                 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 \
@@ -897,9 +921,6 @@ uninstall-am: uninstall-info-am
        mostlyclean-generic uninstall uninstall-am uninstall-info-am
 
 
-unexport LARCH_PATH
-unexport LCLIMPORTDIR
-
 .PHONY: all check
 all check: fulltest
 
@@ -944,19 +965,9 @@ $(SPLINT):
 .c.diff:
        $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
 
-#drl temporally take this out.
-#.PHONY: expects
-#expects:
-#      @echo "Saving old expects..."; \
-#       cat *.expect >expects-`date +"%y-%m-%d-%H"`
-#      @for TEST in $(UNITTESTS) $(INTEGTESTS); do \
-#         echo "Making $$TEST.expect..."; \
-#         $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.expect; \
-#         cat $$TEST.expect; \
-#       done
-
 .PHONY: quicktest
 quicktest:
+       $(CheckSystemDir)       
        @for TEST in $(QUICKTESTS); do \
           echo "Checking $$TEST..."; \
           $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.out && \
@@ -1039,6 +1050,15 @@ arraydims:
        -$(SPLINTR) arraydims.c -varuse -expect 2
        -$(SPLINTR) arraydims.c -initsize -varuse
 
+.PHONY: arrayinit
+arrayinit:
+       -$(SPLINTR) arrayinit.c -expect 9
+
+.PHONY: arraylit
+arraylit:
+       -$(SPLINTR) arraylit.c -expect 2
+       -$(SPLINTR) arraylit.c +stringliteralsmaller -expect 4
+
 .PHONY: blocks
 blocks:
        -$(SPLINTR) blocks.c -expect 4
@@ -1102,6 +1122,10 @@ compdestroy:
 compoundliterals:
        ${SPLINTRN} compoundliterals.c 
 
+.PHONY: compoundstmt
+compoundstmt:
+       ${SPLINTRN} compoundstmt.c -expect 3
+
 .PHONY: constannot
 constannot:
        ${SPLINTRN} constannot.c +boundswrite -exportlocal -expect 2
@@ -1308,6 +1332,10 @@ loopexec:
        -$(SPLINTR) loopexec.c -expect 1
        -$(SPLINTR) loopexec.c -obviousloopexec -expect 3
 
+.PHONY: looptesteffect
+looptesteffect:
+       -$(SPLINTR) looptesteffect.c -expect 1
+
 .PHONY: macros
 macros:
        -$(SPLINTR) macros -expect 17 
@@ -1554,10 +1582,14 @@ stack:
 staticarray:
        -$(SPLINTR) staticarray.c -expect 3
 
+###
+### evans 2002-03-16: Default setting of stringliteralnoroomfinalnull changed
+### 
+
 .PHONY: stringliteral
 stringliteral:
-       -$(SPLINTR) stringliteral.c +stringliteralnoroomfinalnull -expect 4
-       -$(SPLINTR) stringliteral.c -expect 3
+       -$(SPLINTR) stringliteral.c -stringliteralnoroomfinalnull -expect 3
+       -$(SPLINTR) stringliteral.c -expect 4
 
 .PHONY: strings
 strings:
@@ -1569,6 +1601,10 @@ strings:
 structassign:
        -$(SPLINTR) structassign.c -expect 4
 
+.PHONY: typeof
+typeof:
+       -$(SPLINTR) typeof.c -expect 2
+
 .PHONY: typequals
 typequals:
        -$(SPLINTR) typequals.c tq.lcl -expect 5
@@ -1600,6 +1636,10 @@ union:
 unioninit:
        -$(SPLINTR) unioninit.c -expect 2
 
+.PHONY: unnamedsu
+unnamedsu:
+       -$(SPLINTR) unnamedsu.c -expect 0
+
 .PHONY: unreachable
 unreachable:
        -$(SPLINTR) unreachable.c -expect 5

diff --git a/test/Makefile.am b/test/Makefile.am
index 406bc42a95bb2ef42593789e9546813653b5dd06..e33bceb72dbf0c8635f600f30ddc59b295cf342b 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,9 +8,12 @@ DIFFFLAGS =
 
 # -u show context
 
+#drl 3/27/2002 get the test suit to print a warning when splint is built under /usr/
+
+
 ## Set up the splint commands
 
-SPLINT    = $(top_builddir)/src/splint$(EXEEXT)
+SPLINT    =  $(top_builddir)/src/splint$(EXEEXT)
 
 ### These are shell-specific
 ## unexport LARCH_PATH
@@ -139,8 +142,11 @@ CLEANOUTPUT = $(GREP) -v "Splint 3." | $(GREP) -v "$(SPLINT)" | $(GREP) -v "^mak
 #         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." )
+
 .PHONY: quicktest
 quicktest:
+       $(CheckSystemDir)       
        @for TEST in $(QUICKTESTS); do \
           echo "Checking $$TEST..."; \
           $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.out && \

diff --git a/test/Makefile.in b/test/Makefile.in
index 35abdd9c623d1a05edc5ed209ad1cf6444b328ac..263863de02af26d458af2bf418ec10ae918f6ea2 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -91,6 +91,8 @@ DIFFFLAGS =
 
 
 # -u show context
+
+#drl 3/27/2002 get the test suit to print a warning when splint is built under /usr/
 SPLINT = $(top_builddir)/src/splint$(EXEEXT)
 
 ### These are shell-specific
@@ -147,6 +149,19 @@ 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 temporally take this out.
+#.PHONY: expects
+#expects:
+#      @echo "Saving old expects..."; \
+#       cat *.expect >expects-`date +"%y-%m-%d-%H"`
+#      @for TEST in $(UNITTESTS) $(INTEGTESTS); do \
+#         echo "Making $$TEST.expect..."; \
+#         $(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." )
+
 #drl 11/29/2001 This is a very ugly hack to get make dist to work
 EXTRA_DIST = ./abst_t.lcl ./abst_t.lcs  \
               ./abstptr.lcl ./abstptr.lcs \
@@ -950,19 +965,9 @@ $(SPLINT):
 .c.diff:
        $(MAKE) $* |& $(CLEANOUTPUT) >$*.out && diff $*.expect $*.out
 
-#drl temporally take this out.
-#.PHONY: expects
-#expects:
-#      @echo "Saving old expects..."; \
-#       cat *.expect >expects-`date +"%y-%m-%d-%H"`
-#      @for TEST in $(UNITTESTS) $(INTEGTESTS); do \
-#         echo "Making $$TEST.expect..."; \
-#         $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.expect; \
-#         cat $$TEST.expect; \
-#       done
-
 .PHONY: quicktest
 quicktest:
+       $(CheckSystemDir)       
        @for TEST in $(QUICKTESTS); do \
           echo "Checking $$TEST..."; \
           $(MAKE) $$TEST 2>&1 | $(CLEANOUTPUT) >$$TEST.out && \

diff --git a/test/null6.lcd b/test/null6.lcd
index 89c92fe91d90dc550a8a1b5e44fe376e7e026930..fd64ea612b84fcd8119e75fe2d410479d1c3288b 100644 (file)
--- a/test/null6.lcd
+++ b/test/null6.lcd
@@ -1,5 +1,5 @@
 ;;; Splint Library  null6.lcd
-;;Splint 3.0.1.7 --- 01 Mar 2002
+;;Splint 3.0.1.7 --- 28 Mar 2002
 ;;lib:299
 ;;ctTable
 0 u-2 19 38
@@ -841,18 +841,19 @@
 ^143 20@+@+@0@0@0@0@210#FILE
 ^144 20@+@+@0@0@0@0@211#fpos_t
 *1 (Constant)
-^145 5$#_IOFBF#_IOLBF#_IONBF#BUFSIZ#EOF#FOPEN_MAX#FILENAME_MAX#L_tmpnam#SEEK_CUR#SEEK_END#SEEK_SET#TMP_MAX
+^145 63$#_IOFBF#_IOLBF#_IONBF#BUFSIZ
+^149 5$#EOF#FOPEN_MAX#FILENAME_MAX#L_tmpnam#SEEK_CUR#SEEK_END#SEEK_SET#TMP_MAX
 *3 (Variable)
 ^157 212|@1|6@0@0@0@1#stderr
 *4 (Function)
 ^158 214$@0@s3,g24@6@0@1@s3,g24$@0#remove
 ^159 216$@0@s3,g24@6@0@1@s3,g24$@0#rename
-^160 219@6@5@1@0@0@0@s3@1@s3@3@0@0#tmpfile
+^160 219@6@5@1@0@0@0@s3,g24@6@0@1@s3,g24@18@0@0#tmpfile
 ^161 222$@0@s1@1@tp0,s1@19@3@0#tmpnam
 ^162 224$@0@g24@6@0,s3@1@tp0,g24,s3$@0#fclose
 ^163 226$@0@g24@6@0,s3@1@tp0,g24,s3$@0#fflush
 ^164 229@6@5@1@0@0@0@s3@1@s3@18@0@0#fopen
-^165 232@6@5@1@0@0@0@s3,g24@6@0@1@tp2,s3,g24@3@0@0#freopen
+^165 232@6@5@1@0@0@0@s3,g24@6@0@1@tp2,s3,g24@18@0@0#freopen
 ^166 234$@0@s3@1@s3,tp0,tp1$@0#setbuf
 ^167 236$@0@s3@1@s3,tp0,tp1$@0#setvbuf
 ^168 240@6@0@1@1@0@0@s3@1@s3,tp0$@0#fprintf

diff --git a/test/tests2.5/newlint.lcd b/test/tests2.5/newlint.lcd
index a53d4b796e7378942fb87df67ac1e23bb038205b..b0838cb4f1ddd11709365bcf38ba5707047e48c3 100644 (file)
--- a/test/tests2.5/newlint.lcd
+++ b/test/tests2.5/newlint.lcd
@@ -1,5 +1,5 @@
 ;;; Splint Library  newlint.lcd
-;;Splint 3.0.1.7 --- 01 Mar 2002
+;;Splint 3.0.1.7 --- 28 Mar 2002
 ;;lib:299
 ;;ctTable
 0 u-2 19 38
@@ -846,18 +846,19 @@
 ^143 20@+@+@0@0@0@0@210#FILE
 ^144 20@+@+@0@0@0@0@211#fpos_t
 *1 (Constant)
-^145 5$#_IOFBF#_IOLBF#_IONBF#BUFSIZ#EOF#FOPEN_MAX#FILENAME_MAX#L_tmpnam#SEEK_CUR#SEEK_END#SEEK_SET#TMP_MAX
+^145 63$#_IOFBF#_IOLBF#_IONBF#BUFSIZ
+^149 5$#EOF#FOPEN_MAX#FILENAME_MAX#L_tmpnam#SEEK_CUR#SEEK_END#SEEK_SET#TMP_MAX
 *3 (Variable)
 ^157 212|@1|6@0@0@0@1#stderr
 *4 (Function)
 ^158 214$@0@s3,g24@6@0@1@s3,g24$@0#remove
 ^159 216$@0@s3,g24@6@0@1@s3,g24$@0#rename
-^160 219@6@5@1@0@0@0@s3@1@s3@3@0@0#tmpfile
+^160 219@6@5@1@0@0@0@s3,g24@6@0@1@s3,g24@18@0@0#tmpfile
 ^161 222$@0@s1@1@tp0,s1@19@3@0#tmpnam
 ^162 224$@0@g24@6@0,s3@1@tp0,g24,s3$@0#fclose
 ^163 226$@0@g24@6@0,s3@1@tp0,g24,s3$@0#fflush
 ^164 229@6@5@1@0@0@0@s3@1@s3@18@0@0#fopen
-^165 232@6@5@1@0@0@0@s3,g24@6@0@1@tp2,s3,g24@3@0@0#freopen
+^165 232@6@5@1@0@0@0@s3,g24@6@0@1@tp2,s3,g24@18@0@0#freopen
 ^166 234$@0@s3@1@s3,tp0,tp1$@0#setbuf
 ^167 236$@0@s3@1@s3,tp0,tp1$@0#setvbuf
 ^168 240@6@0@1@1@0@0@s3@1@s3,tp0$@0#fprintf