Changeset 14991 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Dec 4, 2008 3:17:33 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40362

Message:

Main: rework the Linux host drive code to use libdbus-1 directly instead of libhal

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstHostHardwareLinux.cpp (moved) (moved from trunk/src/VBox/Main/testcase/tstUSBLinux.cpp ) (3 diffs)
• tstUSBLinux.h (modified) (1 diff)

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

@@ -33 +33 @@
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),tstCollector,)
   PROGRAMS.linux += \
-        $(if $(VBOX_OSE),,$(if $(VBOX_USB_WITH_SYSFS),tstUSBLinux,))
+        $(if $(VBOX_OSE),,tstHostHardwareLinux)
  endif # !VBOX_WITH_TESTCASES
 endif # !VBOX_ONLY_SDK
@@ -120 +120 @@
 
 #
-# tstUSBLinux
+# tstHostHardwareLinux
 #
-tstUSBLinux_TEMPLATE  = VBOXR3TSTEXE
-tstUSBLinux_SOURCES   = \
-        tstUSBLinux.cpp \
-        ../linux/USBProxyServiceLinux.cpp
-tstUSBLinux_INCS      = . ../include
-tstUSBLinux_DEFS      = \
+tstHostHardwareLinux_TEMPLATE  = VBOXR3TSTEXE
+tstHostHardwareLinux_SOURCES   = \
+        tstHostHardwareLinux.cpp \
+        ../linux/USBProxyServiceLinux.cpp \
+        ../linux/HostHardwareLinux.cpp
+tstHostHardwareLinux_INCS      = . ../include
+tstHostHardwareLinux_DEFS      = \
         VBOX_TEST_USB_LINUX \
         $(if $(VBOX_WITHOUT_LINUX_COMPILER_H),VBOX_WITHOUT_LINUX_COMPILER_H,) \
+        $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
         $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
-tstUSBLinux_LIBS     += $(PATH_OUT)/lib/USBLib.a
-tstUSBLinux_CFLAGS   += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CFLAGS),)
-tstUSBLinux_CXXFLAGS += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CXXFLAGS),)
-tstUSBLinux_LDFLAGS  += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_LDFLAGS),)
+tstHostHardwareLinux_LIBS     += $(PATH_OUT)/lib/USBLib.a
+tstHostHardwareLinux_CFLAGS   += $(if $(VBOX_WITH_DBUS),$(VBOX_DBUS_CFLAGS),)
+tstHostHardwareLinux_CXXFLAGS += $(if $(VBOX_WITH_DBUS),$(VBOX_DBUS_CXXFLAGS),)
+tstHostHardwareLinux_LDFLAGS  += $(if $(VBOX_WITH_DBUS),$(VBOX_DBUS_LDFLAGS),)
 
 

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -14 +14 @@
  */
 
-#include "tstUSBLinux.h"
+#ifdef VBOX_USB_WITH_SYSFS
+# include "tstUSBLinux.h"
+#endif
+
+#include <HostHardwareLinux.h>
 
 #include <VBox/err.h>
@@ -27 +31 @@
 {
     RTR3Init();
+#ifdef VBOX_USB_WITH_SYSFS
     USBProxyServiceLinux service;
     service.initSysfs();
@@ -74 +79 @@
         }
     }
+#endif  /* VBOX_USB_WITH_SYSFS */
+    VBoxMainDriveInfo driveInfo;
+    g_testHostHardwareLinux = true;
+    int rc = driveInfo.updateFloppies();
+    if (RT_SUCCESS (rc))
+        rc = driveInfo.updateDVDs();
+    if (RT_FAILURE (rc))
+    {
+        RTPrintf("Failed to update the host drive information, error %Rrc\n",
+                 rc);
+        return 1;
+    }
+    RTPrintf ("Listing floppy drives detected:\n");
+    for (VBoxMainDriveInfo::DriveInfoList::const_iterator it = driveInfo.FloppyBegin();
+         it != driveInfo.FloppyEnd(); ++it)
+    {
+        RTPrintf ("  device: %s", it->mDevice.c_str());
+        if (!it->mUdi.empty())
+            RTPrintf (", udi: %s", it->mUdi.c_str());
+        if (!it->mDescription.empty())
+            RTPrintf (", description: %s", it->mDescription.c_str());
+        RTPrintf ("\n");
+    }
+    RTPrintf ("Listing DVD drives detected:\n");
+    for (VBoxMainDriveInfo::DriveInfoList::const_iterator it = driveInfo.DVDBegin();
+         it != driveInfo.DVDEnd(); ++it)
+    {
+        RTPrintf ("  device: %s", it->mDevice.c_str());
+        if (!it->mUdi.empty())
+            RTPrintf (", udi: %s", it->mUdi.c_str());
+        if (!it->mDescription.empty())
+            RTPrintf (", description: %s", it->mDescription.c_str());
+        RTPrintf ("\n");
+    }
     return 0;
 }

trunk/src/VBox/Main/testcase/tstUSBLinux.h

@@ -24 +24 @@
 
 #ifdef VBOX_USB_WITH_SYSFS
-# include "libhal.h"
+# include <libhal.h>
 #endif