Skip to content

Commit 1778c6d

Browse files
authored
Merge pull request ARMmbed#13501 from jeromecoutant/PR_USB_TEST
USB-DEVICE tests: move host scripts
2 parents 3de2c9b + f9832cb commit 1778c6d

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed

drivers/tests/TESTS/usb_device/msd/main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ void msd_process(USBMSD *msd)
270270
*/
271271
void storage_init()
272272
{
273-
TEST_ASSERT_MESSAGE(mbed_heap_size >= MIN_HEAP_SIZE, "Not enough heap memory for HeapBlockDevice creation");
273+
TEST_SKIP_UNLESS_MESSAGE(mbed_heap_size >= MIN_HEAP_SIZE, "Not enough heap memory for HeapBlockDevice creation");
274274
FATFileSystem::format(get_heap_block_device());
275275
bool result = prepare_storage(get_heap_block_device(), &heap_fs);
276276
TEST_ASSERT_MESSAGE(result, "heap storage initialisation failed");
@@ -457,13 +457,13 @@ void mount_unmount_and_data_test(BlockDevice *bd, FileSystem *fs)
457457

458458
void heap_block_device_mount_unmount_test()
459459
{
460-
TEST_ASSERT_MESSAGE(mbed_heap_size >= MIN_HEAP_SIZE, "Not enough heap memory for HeapBlockDevice creation");
460+
TEST_SKIP_UNLESS_MESSAGE(mbed_heap_size >= MIN_HEAP_SIZE, "Not enough heap memory for HeapBlockDevice creation");
461461
mount_unmount_test<3>(get_heap_block_device(), &heap_fs);
462462
}
463463

464464
void heap_block_device_mount_unmount_and_data_test()
465465
{
466-
TEST_ASSERT_MESSAGE(mbed_heap_size >= MIN_HEAP_SIZE, "Not enough heap memory for HeapBlockDevice creation");
466+
TEST_SKIP_UNLESS_MESSAGE(mbed_heap_size >= MIN_HEAP_SIZE, "Not enough heap memory for HeapBlockDevice creation");
467467
mount_unmount_and_data_test(get_heap_block_device(), &heap_fs);
468468
}
469469

@@ -478,6 +478,7 @@ Case cases[] = {
478478
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
479479
{
480480
GREENTEA_SETUP(300, "pyusb_msd");
481+
utest_printf("mbed_heap_size %u MIN_HEAP_SIZE %u\n", mbed_heap_size, MIN_HEAP_SIZE);
481482
utest::v1::status_t status = greentea_test_setup_handler(number_of_cases);
482483
TestUSBMSD::setup_serial_number();
483484
return status;

0 commit comments

Comments
 (0)