[haiku-commits] haiku: hrev48358 - in src: tests/kits/storage add-ons/kernel/drivers/ports/pc_serial
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 21 Nov 2014 17:45:52 +0100 (CET)
hrev48358 adds 2 changesets to branch 'master'
old head: fbf05ef15b011a65f698e8b6d5532e9a53f020a2
new head: 1f8b3fdb7e10d481850fd91618e7a8b5b57bcace
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1f8b3fd+%5Efbf05ef
----------------------------------------------------------------------------
ec1395b: pc_serial: trace when ignoring the kernel debug port.
* Since it is currently ignored even when serial debug is disabled in
the settings file, this was a bit confusing.
1f8b3fd: Storage Kit tests: apply relevant parts of #7025
Patch by Karvjorm. Picked only the code changes as it seems the Jamfile
changes were not needed or already done.
* Use BObjectList instead of BList
* Add some more directory constants to FindDirectory tests.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 17 insertions(+), 4 deletions(-)
src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp | 4 +++-
src/tests/kits/storage/FindDirectoryTest.cpp | 9 +++++++++
src/tests/kits/storage/QueryTest.cpp | 3 ++-
src/tests/kits/storage/TestApp.h | 5 +++--
############################################################################
Commit: ec1395bda94985bc4cebc2f0abf2c22edf89b487
URL: http://cgit.haiku-os.org/haiku/commit/?id=ec1395b
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Fri Nov 21 16:14:57 2014 UTC
pc_serial: trace when ignoring the kernel debug port.
* Since it is currently ignored even when serial debug is disabled in
the settings file, this was a bit confusing.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp
b/src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp
index 69de6ed..e5afb3b 100644
--- a/src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp
+++ b/src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp
@@ -526,8 +526,10 @@ scan_isa_hardcoded()
for (i = 0; i < 4; i++) {
// skip the port used for kernel debugging...
- if (sHardcodedPorts[i].ioBase == gKernelDebugPort)
+ if (sHardcodedPorts[i].ioBase == gKernelDebugPort) {
+ TRACE_ALWAYS("Skipping port %d as it is used for kernel
debug.\n", i);
continue;
+ }
SerialDevice *device;
device = new(std::nothrow) SerialDevice(&sSupportedDevices[0],
############################################################################
Revision: hrev48358
Commit: 1f8b3fdb7e10d481850fd91618e7a8b5b57bcace
URL: http://cgit.haiku-os.org/haiku/commit/?id=1f8b3fd
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Fri Nov 21 16:41:59 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/7025
Storage Kit tests: apply relevant parts of #7025
Patch by Karvjorm. Picked only the code changes as it seems the Jamfile
changes were not needed or already done.
* Use BObjectList instead of BList
* Add some more directory constants to FindDirectory tests.
----------------------------------------------------------------------------
diff --git a/src/tests/kits/storage/FindDirectoryTest.cpp
b/src/tests/kits/storage/FindDirectoryTest.cpp
index 63c7579..75e8196 100644
--- a/src/tests/kits/storage/FindDirectoryTest.cpp
+++ b/src/tests/kits/storage/FindDirectoryTest.cpp
@@ -236,6 +236,9 @@ test_find_directory(directory_which dir, BPath &path, dev_t
device)
case B_USER_DIRECTORY:
error = path.SetTo("/boot/home");
break;
+ case B_USER_CACHE_DIRECTORY:
+ error = path.SetTo("/boot/common/cache");
+ break;
case B_USER_CONFIG_DIRECTORY:
error = path.SetTo("/boot/home/config");
break;
@@ -245,6 +248,9 @@ test_find_directory(directory_which dir, BPath &path, dev_t
device)
case B_USER_BOOT_DIRECTORY:
error = path.SetTo("/boot/home/config/boot");
break;
+ case B_USER_DATA_DIRECTORY:
+ error = path.SetTo("/boot/home/config/data");
+ break;
case B_USER_FONTS_DIRECTORY:
error = path.SetTo("/boot/home/config/fonts");
break;
@@ -269,6 +275,9 @@ test_find_directory(directory_which dir, BPath &path, dev_t
device)
case B_USER_SOUNDS_DIRECTORY:
error = path.SetTo("/boot/home/config/sounds");
break;
+ case B_SYSTEM_DATA_DIRECTORY:
+ error = path.SetTo("/boot/system/data");
+ break;
// Global directories.
case B_APPS_DIRECTORY:
error = path.SetTo("/boot/system/apps");
diff --git a/src/tests/kits/storage/QueryTest.cpp
b/src/tests/kits/storage/QueryTest.cpp
index b645b09..ac11ea4 100644
--- a/src/tests/kits/storage/QueryTest.cpp
+++ b/src/tests/kits/storage/QueryTest.cpp
@@ -13,6 +13,7 @@
#include <MessageQueue.h>
#include <Messenger.h>
#include <NodeMonitor.h>
+#include <ObjectList.h>
#include <OS.h>
#include <Path.h>
#include <Query.h>
@@ -265,7 +266,7 @@ public:
return (PredicateNode*)children.ItemAt(index);
}
- BList children;
+ BObjectList<PredicateNode> children;
};
// OpNode
diff --git a/src/tests/kits/storage/TestApp.h b/src/tests/kits/storage/TestApp.h
index d436405..aad4a40 100644
--- a/src/tests/kits/storage/TestApp.h
+++ b/src/tests/kits/storage/TestApp.h
@@ -4,7 +4,7 @@
#define _beos_test_app_h_
#include <Application.h>
-#include <List.h>
+#include <ObjectList.h>
#include <MessageQueue.h>
// TestHandler
@@ -41,8 +41,9 @@ private:
static int32 _AppThreadStart(void *data);
private:
+ typedef BObjectList<BTestHandler> TestHandlers;
thread_id fAppThread;
- BList fHandlers;
+ TestHandlers fHandlers;
};
#endif // _beos_test_app_h_
Other related posts:
