Changeset 98171 in vbox for trunk

Timestamp:

Jan 20, 2023 8:48:14 PM (2 years ago)

Author:

vboxsync

Message:

Devices/E1000: Made the two testcases build again. bugref:10348

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DevE1000Phy.cpp (modified) (4 diffs)
• Network/testcase/tstDevEEPROM.cpp (modified) (2 diffs)
• Network/testcase/tstDevPhy.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -1488 +1488 @@
    tstDevEEPROM_TEMPLATE    = VBOXCPPUNITEXE
    tstDevEEPROM_SOURCES     = \
-        Network/testcase/tstDevEEPROM.cpp
+        Network/testcase/tstDevEEPROM.cpp \
+        Network/DevEEPROM.cpp
    tstDevEEPROM_LIBS        = \
         $(TARGET_VBoxDD)
+
    PROGRAMS += tstDevPhy
    tstDevPhy_TEMPLATE    = VBOXCPPUNITEXE

trunk/src/VBox/Devices/Network/DevE1000Phy.cpp

@@ -51 +51 @@
 /* Little helpers ************************************************************/
 #ifdef PHY_UNIT_TEST
-# define SSMR3PutMem(a,b,c)
-# define SSMR3GetMem(a,b,c)
 # include <stdio.h>
 # define PhyLog(a)               printf a
@@ -64 +62 @@
 /* Internals */
 namespace Phy {
-#if defined(LOG_ENABLED) && !defined(PHY_UNIT_TEST)
+#if defined(LOG_ENABLED) || defined(PHY_UNIT_TEST)
     /** Retrieves state name by id */
     static const char * getStateName(uint16_t u16State);
@@ -380 +378 @@
     PhyLog(("PHY#%d PSTATUS=%04x PSSTAT=%04x\n", pPhy->iInstance, REG(PSTATUS), REG(PSSTAT)));
 
+#ifndef PHY_UNIT_TEST
     e1kPhyLinkResetCallback(pDevIns);
+#else
+    RT_NOREF(pDevIns);
+#endif
 }
 
@@ -514 +516 @@
 }
 
-#if defined(LOG_ENABLED) && !defined(PHY_UNIT_TEST)
+#if defined(LOG_ENABLED) || defined(PHY_UNIT_TEST)
 static const char * Phy::getStateName(uint16_t u16State)
 {

trunk/src/VBox/Devices/Network/testcase/tstDevEEPROM.cpp

@@ -29 +29 @@
 #include <cppunit/extensions/HelperMacros.h>
 
+#include <VBox/vmm/pdmdev.h>
 #include "../DevEEPROM.h"
 
@@ -520 +521 @@
 
 // Create text test runner and run all tests.
-int main( int argc, char **argv)
+int main()
 {
     CppUnit::TextUi::TestRunner runner;

trunk/src/VBox/Devices/Network/testcase/tstDevPhy.cpp

@@ -166 +166 @@
 
 // Create text test runner and run all tests.
-int main( int argc, char **argv)
+int main()
 {
     CppUnit::TextUi::TestRunner runner;