Changeset 13567 in vbox

Timestamp:

Oct 24, 2008 11:11:05 PM (16 years ago)

Author:

vboxsync

Message:

tstInstrEmul: unbusted the darwin build and straigthened up the testcase output a bit.

Location:

trunk/src/VBox/VMM/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstInstrEmul.cpp (modified) (5 diffs)

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

@@ -334 +334 @@
 # Run rule for tstInstrEmul.
 #
-$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run: $$(INSTARGET_tstInstrEmul)
+$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run: $$(INSTARGET_tstInstrEmul) | $$(dir $$@)
         $(QUIET)$(RM) -f $@
-        $(INSTARGET_tstInstrEmul)
+        $(QUIET)$(REDIRECT) -E 'VBOX_LOG_FLAGS=disabled' -E 'VBOX_LOG_DEST=nofile' \
+                $(if $(eq $(KBUILD_TARGET),darwin), -E 'DYLD_FALLBACK_LIBRARY_PATH=$(dir $(LIB_RUNTIME))') \
+                -- \
+                $(INSTARGET_tstInstrEmul)
         $(QUIET)$(APPEND) "$@" "done"

trunk/src/VBox/VMM/testcase/tstInstrEmul.cpp

@@ -40 +40 @@
     int     rcRet = 0;                  /* error count. */
 
+    RTR3Init();
+    RTPrintf("tstInstrEmul: TESTING...\n");
+
     uint32_t eax, edx, ebx, ecx, eflags;
     uint64_t val;
@@ -52 +55 @@
         ||  val != UINT64_C(0x200000001))
     {
-        printf("Lock cmpxchg8b failed the equal case! (val=%x%x)\n", val);
-        return -1;
+        RTPrintf("tstInstrEmul: FAILURE - Lock cmpxchg8b failed the equal case! (val=%x%x)\n", val);
+        return 1;
     }
     val = UINT64_C(0x123456789);
@@ -61 +64 @@
         ||  edx != 0x1)
     {
-        printf("Lock cmpxchg8b failed the non-equal case! (val=%x%x)\n", val);
-        return -1;
+        RTPrintf("tstInstrEmul: FAILURE - Lock cmpxchg8b failed the non-equal case! (val=%x%x)\n", val);
+        return 1;
     }
-    printf("Testing lock cmpxchg instruction emulation - SUCCESS\n");
+    RTPrintf("tstInstrEmul: Testing lock cmpxchg instruction emulation - SUCCESS\n");
 
     val = UINT64_C(0xffffffffffff);
@@ -75 +78 @@
         ||  val != UINT64_C(0x200000001))
     {
-        printf("Cmpxchg8b failed the equal case! (val=%x%x)\n", val);
-        return -1;
+        RTPrintf("tstInstrEmul: FAILURE - Cmpxchg8b failed the equal case! (val=%x%x)\n", val);
+        return 1;
     }
     val = UINT64_C(0x123456789);
@@ -84 +87 @@
         ||  edx != 0x1)
     {
-        printf("Cmpxchg8b failed the non-equal case! (val=%x%x)\n", val);
-        return -1;
+        RTPrintf("tstInstrEmul: FAILURE - Cmpxchg8b failed the non-equal case! (val=%x%x)\n", val);
+        return 1;
     }
-    printf("Testing cmpxchg instruction emulation - SUCCESS\n");
+    RTPrintf("tstInstrEmul: Testing cmpxchg instruction emulation - SUCCESS\n");
 
-    return rcRet;
+
+    /*
+     * Summary.
+     */
+    if (!rcRet)
+        RTPrintf("tstInstrEmul: SUCCESS\n");
+    else
+        RTPrintf("tstInstrEmul: FAILURE - %d errors\n", rcRet);
+    return rcRet ? 1 : 0;
 }