Changeset 8745 for trunk/testsuite

Timestamp:

Jun 25, 2002, 2:48:00 AM (23 years ago)

Author:

bird

Message:

More or less done for now.

File:

• trunk/testsuite/cui/watcomc.mak (modified) (7 diffs)

trunk/testsuite/cui/watcomc.mak

@@ -1 @@
-# $Id: watcomc.mak,v 1.2 2002-06-20 02:28:07 bird Exp $
+# $Id: watcomc.mak,v 1.3 2002-06-25 00:48:00 bird Exp $
 
 #
@@ -36 +36 @@
 WCL386 = $(WATCOM)\binnt\wcl386.exe
 WCC386 = $(WATCOM)\binnt\wcc386.exe
-WLINK = $(WATCOM)\binnt\wlink.exe
+WLINK  = $(WATCOM)\binnt\wlink.exe
 WMAKE  = $(WATCOM)\binnt\wmake.exe
 
@@ -47 +47 @@
 testcase:   $(BIN_FILES)
     @$(ECHO) + Running testcases for WatCom C/C++ v11.0c(beta) $(CLRRST)
-    $(TS_EXEC_1) "wcl386 help" $(TS_EXEC_2) testcase-wcl386-help - doesn work.
-    $(TS_EXEC_1) "wcc386+wlink 'hello world'" $(TS_EXEC_2) testcase-helloworld
+    $(TS_EXEC_1) "wcl386 help" $(TS_EXEC_2) testcase-wcl386-help
+    $(TS_EXEC_1) "wcc386 compile 'hello world'" $(TS_EXEC_2) testcase-compile
+    $(TS_EXEC_1) "wcc386+wlink compile, link and run 'hello world'" $(TS_EXEC_2) testcase-helloworld
+    $(TS_EXEC_1) "wcl386 compile and link 'hello world'" $(TS_EXEC_2) testcase-compile-and-link
     @$(ECHO) + Completed WatCom C/C++ v11.0c(beta)! $(CLRRST)
 
@@ -57 +59 @@
 #
 testcase-wcl386-help: $(PATH_TARGET)\wcl386.help.stdout
-    false - testcase is broken. Doesn't detect pipe.
-    SET PATH=$(WATCOM)\winnt;$(PATH)
-    $(TS_PEC) $(WCL386) > $(PATH_TARGET)\stdout 2> $(PATH_TARGET)\stderr
+    SET PATH=$(WATCOM)\winnt;$(PATH)
+    -1 $(TS_PEC) $(WCL386) > $(PATH_TARGET)\stdout 2> $(PATH_TARGET)\stderr
     $(TS_TEST_FILE_Z)   $(PATH_TARGET)\stderr
     $(TS_TEST_FILE_NZ)  $(PATH_TARGET)\stdout
@@ -161 +162 @@
 
 
+#
+# Testcase where we try to run compile some simple source.
+#
+testcase-compile: $(PATH_TARGET)\helloworld.c
+    SET PATH=$(WATCOM)\winnt;$(PATH)
+    $(TS_PEC) $(WCC386) -I$(WATCOM)\h\nt -I$(WATCOM)\h -Fo=$(PATH_TARGET)\compile.obj \
+        $(PATH_TARGET)\helloworld.c
+    $(TS_TEST_FILE_NZ) $(PATH_TARGET)\compile.obj
+
+
+#
+# Testcase where we try to run compile some simple source.
+#
+testcase-compile-and-link: $(PATH_TARGET)\helloworld.c
+    SET PATH=$(WATCOM)\winnt;$(PATH)
+    $(TS_PEC) $(WCL386) -bt=tnt -l=tnt -I$(WATCOM)\h\nt -I$(WATCOM)\h \
+        -Fo=$(PATH_TARGET)\compileandlink.obj -Fe=$(PATH_TARGET)\compileandlink.exe \
+        $(PATH_TARGET)\helloworld.c
+    $(TS_TEST_FILE_NZ) $(PATH_TARGET)\compileandlink.obj
+    $(TS_TEST_FILE_NZ) $(PATH_TARGET)\compileandlink.exe
+
 
 #
@@ -172 +194 @@
         $(PATH_TARGET)\helloworld.c
     $(TS_TEST_FILE_NZ) $(PATH_TARGET)\helloworld.obj
-    echo . & SET LIB=$(WATCOM)\lib386\nt;$(WATCOM)\lib386; && \
-        $(TS_PEC) $(WLINK) FORMAT Window NT \
-            FILE $(PATH_TARGET)\helloworld.obj \
-            NAME $(PATH_TARGET)\helloworld.exe \
-            LIBPATH $(WATCOM)\lib386\nt;$(WATCOM)\lib386
+    SET LIB=$(WATCOM)\lib386\nt;$(WATCOM)\lib386;
+    $(TS_PEC) $(WLINK) \
+        FORMAT Window NT \
+        FILE $(PATH_TARGET)\helloworld.obj \
+        NAME $(PATH_TARGET)\helloworld.exe \
+        LIBPATH $(WATCOM)\lib386\nt;$(WATCOM)\lib386
     $(TS_TEST_FILE_NZ) $(PATH_TARGET)\helloworld.exe
     $(TOOL_COPY) $(PATH_TARGET)\helloworld.exe .\helloworld.exe
@@ -185 +208 @@
 Hello stderr
 <<
-    $(TS_SED) "s/=$(MAKEDIR:\=\\)\\HELLOWORD.EXE/HelloWorld.ExE/I" $(PATH_TARGET)\stdout | $(TS_CMP) $(PATH_TARGET)\helloworld.stdout -
+    $(TS_SED) "s/=$(MAKEDIR:\=\\)\\HELLOWORLD\.EXE/=HelloWorld\.ExE/I" $(PATH_TARGET)\stdout | $(TS_CMP) $(PATH_TARGET)\helloworld.stdout -