test/Makefile.os2: merged in changes from 3.0.1.6 to 3.0.1.7

diff --git a/test/Makefile.os2 b/test/Makefile.os2
index d06dd331e8a3838c908d1d3cb6c963fc1e6fbd11..af76b7e48f1f17f2c7d11b2c550712c56e63e0b7 100644 (file)
--- a/test/Makefile.os2
+++ b/test/Makefile.os2
@@ -8,32 +8,6 @@
 \r
 SHELL = cmd.exe\r
 \r
-.PHONY: all fulltest quicktest funcpointer cast abstract\r
-.PHONY:        version help abstptr abstract alias alttypes ansireserved \r
-.PHONY: argorder blocks break cases cast charlit \r
-.PHONY: clauses commentchar \r
-.PHONY: compdestroy constannot controldepth csyntax czechnames czechoslovaknames \r
-.PHONY: deadparam decl enum exports external fields fileio flags forbody format funcpointer glob globals \r
-.PHONY: impabstract init inparam internal iter keep libs lintcomments \r
-.PHONY: list macros macrosef merge mergestate modifies modtest moduncon mongoincludes \r
-.PHONY: noeffect null observer oldstyle outglob outparam postnotnull preds prefixes printflike rc \r
-.PHONY: refcounts release repexpose returned sharing slovaknames special\r
-.PHONY: specclauses stack staticarray \r
-.PHONY: strings structassign nullret\r
-.PHONY: tainted typequals ud ulstypes union unreachable unused ullint unsignedcompare void\r
-.PHONY: db1 db2 db3 tests2.2 tests2.2a tests2.4 tests2.5\r
-.PHONY: all test fulltest expects quicktest\r
-.PHONY: warnuse metastate\r
-.PHONY: linked freearray\r
-.PHONY: sizeoftest\r
-.PHONY: bufferTest\r
-.PHONY: simplebufferConstraintTests\r
-.PHONY: moreBufferTests\r
-.PHONY: maxset\r
-.PHONY: globalbufferannotation\r
-.PHONY: strchr\r
-.PHONY: for\r
-\r
 .SUFFIXES: .out .expect .c .lcl .h .lh .diff\r
 \r
 # -u show context\r
@@ -56,14 +30,15 @@ SPLINTRNEST = $(SPLINTRNNEST) -exportlocal +debugfcnconstraint
 ###\r
 ### rcfiles not included becuase file names will not match exactly\r
 ###\r
+\r
 UNITTESTS = \\r
   help \\r
   abstptr abstract alias alttypes ansireserved argorder \\r
-  args arraydims blocks break cases cast charlit clauses commentchar compdestroy \\r
-  constannot controldepth csyntax czechnames czechoslovaknames deadparam \\r
+  args arraydims arrayinit arraylit blocks break cases cast charlit clauses commentchar compdestroy \\r
+  compoundliterals compoundstmt constannot controldepth csyntax czechnames czechoslovaknames deadparam \\r
   decl divzero enum exports external fields flags forbody format freearray \\r
   funcpointer functionmacro glob globals impabstract info init inparam internal iter keep libs \\r
-  linked lintcomments list loopexec \\r
+  linked lintcomments list loopexec looptesteffect \\r
   macros macrosef merge mergenull modifies modtest moduncon \\r
   mongoincludes mystrncat noeffect null observer oldstyle outglob outparam \\r
   parentype postnotnull preds prefixes printflike rc refcounts release repexpose \\r
@@ -71,7 +46,8 @@ UNITTESTS = \
   specclauses \\r
   special stack staticarray strings \\r
   stringliteral \\r
-  structassign typequals ud ulstypes union unioninit unreachable unsignedcompare \\r
+  structassign typequals typeof ud ulstypes union unioninit \\r
+  unnamedsu unreachable unsignedcompare \\r
   unused ullint utypes void widestrings\r
 \r
 UNITEXPECTS = $(addsuffix .expect, $(UNITTESTS))\r
@@ -161,6 +137,15 @@ arraydims:
        $(SPLINTR) arraydims.c -varuse -expect 2\r
        $(SPLINTR) arraydims.c -initsize -varuse\r
 \r
+.PHONY: arrayinit\r
+arrayinit:\r
+       $(SPLINTR) arrayinit.c -expect 9\r
+\r
+.PHONY: arraylit\r
+arraylit:\r
+       $(SPLINTR) arraylit.c -expect 2\r
+       $(SPLINTR) arraylit.c +stringliteralsmaller -expect 4\r
+\r
 .PHONY: blocks\r
 blocks:\r
        $(SPLINTR) blocks.c -expect 4\r
@@ -220,6 +205,14 @@ compdestroy:
        $(SPLINTRN) compdestroy.c +checks -exportlocal -exportheader +strictdestroy +strictusereleased -expect 3\r
        $(SPLINTRN) compdestroy.c +strict +partial -exportheader -expect 3\r
 \r
+.PHONY: compoundliterals\r
+compoundliterals:\r
+       ${SPLINTRN} compoundliterals.c \r
+\r
+.PHONY: compoundstmt\r
+compoundstmt:\r
+       ${SPLINTRN} compoundstmt.c -expect 3\r
+\r
 .PHONY: constannot\r
 constannot:\r
        ${SPLINTRN} constannot.c +boundswrite -exportlocal -expect 2\r
@@ -426,6 +419,10 @@ loopexec:
        $(SPLINTR) loopexec.c -expect 1\r
        $(SPLINTR) loopexec.c -obviousloopexec -expect 3\r
 \r
+.PHONY: looptesteffect\r
+looptesteffect:\r
+       $(SPLINTR) looptesteffect.c -expect 1\r
+\r
 .PHONY: macros\r
 macros:\r
        $(SPLINTR) macros -expect 17 \r
@@ -674,6 +671,10 @@ stack:
 staticarray:\r
        $(SPLINTR) staticarray.c -expect 3\r
 \r
+###\r
+### evans 2002-03-16: Default setting of stringliteralnoroomfinalnull changed\r
+### \r
+\r
 .PHONY: stringliteral\r
 stringliteral:\r
        $(SPLINTR) stringliteral.c -stringliteralnoroomfinalnull -expect 3\r
@@ -689,6 +690,10 @@ strings:
 structassign:\r
        $(SPLINTR) structassign.c -expect 4\r
 \r
+.PHONY: typeof\r
+typeof:\r
+       $(SPLINTR) typeof.c -expect 2\r
+\r
 .PHONY: typequals\r
 typequals:\r
        $(SPLINTR) typequals.c tq.lcl -expect 5\r
@@ -720,6 +725,10 @@ union:
 unioninit:\r
        $(SPLINTR) unioninit.c -expect 2\r
 \r
+.PHONY: unnamedsu\r
+unnamedsu:\r
+       $(SPLINTR) unnamedsu.c -expect 0\r
+\r
 .PHONY: unreachable\r
 unreachable:\r
        $(SPLINTR) unreachable.c -expect 5\r
@@ -754,8 +763,7 @@ ullint:
 \r
 .PHONY: utypes\r
 utypes:\r
-# herbert: TODO\r
-       -${SPLINTRN} utypes.c -expect 6\r
+       ${SPLINTRN} utypes.c -expect 6\r
 \r
 ###\r
 \r