From dd66fda39736135b40a99cccf1f5aabc1028c560 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 4 Aug 2018 10:47:56 +0200 Subject: tests: Avoid deprecated rtems_disk_io_initialize() Update #3358. --- testsuites/fstests/fsdosfsformat01/init.c | 3 --- testsuites/fstests/fsdosfssync01/init.c | 3 --- testsuites/fstests/fsdosfswrite01/init.c | 4 ---- testsuites/libtests/block11/init.c | 9 --------- testsuites/libtests/block16/init.c | 3 --- testsuites/libtests/sparsedisk01/init.c | 4 ---- 6 files changed, 26 deletions(-) diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c index fb5896dca4..a8477cb61f 100644 --- a/testsuites/fstests/fsdosfsformat01/init.c +++ b/testsuites/fstests/fsdosfsformat01/init.c @@ -176,9 +176,6 @@ static void test( void ) memset( &rqdata, 0, sizeof( rqdata ) ); - sc = rtems_disk_io_initialize(); - rtems_test_assert( sc == RTEMS_SUCCESSFUL ); - rv = mkdir( mount_dir, S_IRWXU | S_IRWXG | S_IRWXO ); rtems_test_assert( 0 == rv ); diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c index 5aee87622c..e878e59075 100644 --- a/testsuites/fstests/fsdosfssync01/init.c +++ b/testsuites/fstests/fsdosfssync01/init.c @@ -100,9 +100,6 @@ static void test(const char *rda, const char *mnt, const char *file) int disk_fd; int rv; - sc = rtems_disk_io_initialize(); - rtems_test_assert(sc == RTEMS_SUCCESSFUL); - disk_fd = open(rda, O_RDWR); rtems_test_assert(disk_fd >= 0); diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c index 91111cc7fe..5048bdb224 100644 --- a/testsuites/fstests/fsdosfswrite01/init.c +++ b/testsuites/fstests/fsdosfswrite01/init.c @@ -251,10 +251,6 @@ static void test( void ) rtems_status_code sc; int rv; - - sc = rtems_disk_io_initialize(); - rtems_test_assert( sc == RTEMS_SUCCESSFUL ); - rv = mkdir( mount_dir, S_IRWXU | S_IRWXG | S_IRWXO ); rtems_test_assert( 0 == rv ); diff --git a/testsuites/libtests/block11/init.c b/testsuites/libtests/block11/init.c index f607bf515e..82e24d6548 100644 --- a/testsuites/libtests/block11/init.c +++ b/testsuites/libtests/block11/init.c @@ -401,22 +401,13 @@ static void test_blkdev_imfs_errors(void) static rtems_task Init(rtems_task_argument argument) { - rtems_status_code sc; - TEST_BEGIN(); - sc = rtems_disk_io_initialize(); - ASSERT_SC(sc); - test_blkdev_imfs_read_and_write(); test_blkdev_imfs_parameters(); test_blkdev_imfs_errors(); - sc = rtems_disk_io_done(); - ASSERT_SC(sc); - TEST_END(); - exit(0); } diff --git a/testsuites/libtests/block16/init.c b/testsuites/libtests/block16/init.c index 401a888925..64ccded9dc 100644 --- a/testsuites/libtests/block16/init.c +++ b/testsuites/libtests/block16/init.c @@ -48,9 +48,6 @@ static void test(void) rtems_bdbuf_buffer *large_bd; rtems_blkdev_bnum i; - sc = rtems_disk_io_initialize(); - ASSERT_SC(sc); - for (i = 0; i < media_block_count; ++i) { buf [i] = i; } diff --git a/testsuites/libtests/sparsedisk01/init.c b/testsuites/libtests/sparsedisk01/init.c index dfb87ecdd5..e0d25fa444 100644 --- a/testsuites/libtests/sparsedisk01/init.c +++ b/testsuites/libtests/sparsedisk01/init.c @@ -358,10 +358,6 @@ void test( void ) int file_descriptor; uint8_t fill_pattern = 0; - - sc = rtems_disk_io_initialize(); - rtems_test_assert( sc == RTEMS_SUCCESSFUL ); - block_size = 512; block_number = 4 * 2 * 1024; blocks_allocated = 8; -- cgit v1.2.3