Changeset 2873

Timestamp:

Nov 12, 2006, 7:57:52 AM (18 years ago)

Author:

bird

Message:

made tst-0 a bare program without any system dependencies (except on nt).

Location:

trunk/kLdr/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tst-0.c (modified) (2 diffs)
• tst.h (modified) (1 diff)
• tstExeMainStub.c (added)

trunk/kLdr/testcase/Makefile.kmk ¶

@@ -112 +112 @@
 TEMPLATE_TSTBAREPROG = Bare bone testcase program template
 TEMPLATE_TSTBAREPROG_EXTENDS = TSTBARE
-ifneq ($(filter win nt win32 win64,$(BUILD_TARGET)),)
+ifneq ($(filter win win32 win64,$(BUILD_TARGET)),)
 TEMPLATE_TSTBAREPROG_LDFLAGS += -Entry:WinMain -FIXED:NO
 else
+TEMPLATE_TSTBAREPROG_LDFLAGS.nt += -FIXED:NO
 endif
 
@@ -151 +152 @@
 tst-0-d_SOURCES  = tst-0-d.c tstDllMainStub.c
 
-tst-0_TEMPLATE   = TSTPROG
-tst-0_SOURCES    = tst-0.c
+tst-0_TEMPLATE   = TSTBAREPROG
+tst-0_SOURCES    = tst-0.c tstExeMainStub.c
 
 ifeq ($(filter-out nt win win32 win64,$(BUILD_TARGET)),)

trunk/kLdr/testcase/tst-0.c ¶

@@ -1 +1 @@
 #include "tst.h"
-#include <stdio.h>
 
 MY_IMPORT(int) FuncA(void);
@@ -8 +7 @@
 int main()
 {
-    unsigned long ul;
-    printf("graph:\n"
-           "  tst-0 -> a -> d\n"
-           "           b -> d\n"
-           "           c -> d\n");
-    ul = FuncA() | FuncB() | FuncC();
-    if (ul == 0x42424242)
-        printf("tst-0: success, ul=%#lx\n", ul);
-    else
-        printf("tst-0: failure, ul=%#lx\n", ul);
-    return ul == 0x42424242 ? 0 : 1;
+    unsigned u;
+    u = FuncA() | FuncB() | FuncC();
+    return u == 0x42424242 ? 0 : 1;
 }
+

trunk/kLdr/testcase/tst.h ¶

@@ -33 +33 @@
 
 
-#if defined(__OS2__) || defined(__WIN__)
+#if defined(__OS2__) || defined(__WIN__) || defined(__NT__)
 # define MY_EXPORT(type) __declspec(dllexport) type
 //# define MY_IMPORT(type) extern __declspec(dllimport) type