Changeset 69643 in vbox for trunk

Timestamp:

Nov 10, 2017 1:34:06 PM (7 years ago)

Author:

vboxsync

Message:

Make tstRTDarwinMachKernel build on windows because windbg is easier to use than lldb.

Location:

trunk/src/VBox/Runtime

Files:

• r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp (modified) (4 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstRTDarwinMachKernel.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/dbgkrnlinfo-r0drv-darwin.cpp

@@ -47 +47 @@
 #else
 # include <stdio.h> /* for printf */
+#endif
+
+#ifndef IN_RING0 /* A linking tweak for the testcase: */
+# include <iprt/cdefs.h>
+# undef  RTR0DECL
+# define RTR0DECL(type) DECLHIDDEN(type) RTCALL
 #endif
 
@@ -117 +123 @@
 
 #define VERR_LDR_UNEXPECTED     (-641)
+
+#ifndef RT_OS_DARWIN
+# define MAC_OS_X_VERSION_MIN_REQUIRED 1050
+#endif
 
 
@@ -1086 +1096 @@
      */
     static bool s_fFirstCall = true;
+#ifdef IN_RING3
+    extern const char *g_pszTestKernel;
+#endif
     struct
     {
@@ -1092 +1105 @@
     } aKernels[] =
     {
+#ifdef IN_RING3
+        { g_pszTestKernel, VERR_WRONG_ORDER },
+#endif
         { "/System/Library/Kernels/kernel", VERR_WRONG_ORDER },
         { "/System/Library/Kernels/kernel.development", VERR_WRONG_ORDER },

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -157 +157 @@
         tstFileAppendWin-1 \
         tstRTNtPath-1 \
-        ntGetTimerResolution
+        ntGetTimerResolution \
+        tstRTDarwinMachKernel
+
 PROGRAMS.linux += \
         tstRTProcWait \

trunk/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp

@@ -34 +34 @@
 #include <iprt/test.h>
 
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+extern const char *g_pszTestKernel = "/no-such-file";
 
 
@@ -66 +70 @@
 
 
-int main()
+int main(int argc, char **argv)
 {
     RTTEST hTest;
@@ -74 +78 @@
     RTTestBanner(hTest);
 
+    /* Optional kernel path as argument. */
+    if (argc == 2)
+        g_pszTestKernel = argv[1];
+#ifndef RT_OS_DARWIN
+    else
+        return RTTestSkipAndDestroy(hTest, "not on darwin");
+#endif
+
     dotest();