summaryrefslogtreecommitdiffstats
path: root/testsuites/libtests/block08
diff options
context:
space:
mode:
Diffstat (limited to 'testsuites/libtests/block08')
-rw-r--r--testsuites/libtests/block08/bdbuf_test3_2.c4
-rw-r--r--testsuites/libtests/block08/bdbuf_test3_3.c4
-rw-r--r--testsuites/libtests/block08/bdbuf_tests.c27
-rw-r--r--testsuites/libtests/block08/init.c2
-rw-r--r--testsuites/libtests/block08/test_disk.c12
5 files changed, 25 insertions, 24 deletions
diff --git a/testsuites/libtests/block08/bdbuf_test3_2.c b/testsuites/libtests/block08/bdbuf_test3_2.c
index e9cfc9e1a2..aba2bea095 100644
--- a/testsuites/libtests/block08/bdbuf_test3_2.c
+++ b/testsuites/libtests/block08/bdbuf_test3_2.c
@@ -154,7 +154,7 @@ bdbuf_test3_2_thread2(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #2 DEBLOCK\n");
+ printf("Thread #2 DEBLOCK\n");
CONTINUE_MAIN(2);
rc = rtems_bdbuf_release_modified(bd);
@@ -184,7 +184,7 @@ bdbuf_test3_2_thread3(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #3 DEBLOCK\n");
+ printf("Thread #3 DEBLOCK\n");
CONTINUE_MAIN(3);
diff --git a/testsuites/libtests/block08/bdbuf_test3_3.c b/testsuites/libtests/block08/bdbuf_test3_3.c
index 9b3080b13e..562bb78ddb 100644
--- a/testsuites/libtests/block08/bdbuf_test3_3.c
+++ b/testsuites/libtests/block08/bdbuf_test3_3.c
@@ -165,7 +165,7 @@ bdbuf_test3_3_thread2(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #2 DEBLOCK\n");
+ printf("Thread #2 DEBLOCK\n");
CONTINUE_MAIN(2);
rc = rtems_bdbuf_release(bd);
@@ -195,7 +195,7 @@ bdbuf_test3_3_thread3(rtems_task_argument arg)
TEST_FAILED();
}
- printk("Thread #3 DEBLOCK\n");
+ printf("Thread #3 DEBLOCK\n");
CONTINUE_MAIN(3);
diff --git a/testsuites/libtests/block08/bdbuf_tests.c b/testsuites/libtests/block08/bdbuf_tests.c
index c918d937ba..66e69d4fbd 100644
--- a/testsuites/libtests/block08/bdbuf_tests.c
+++ b/testsuites/libtests/block08/bdbuf_tests.c
@@ -33,14 +33,14 @@ struct bdbuf_test_descr {
{ bdbuf_test1_3_main },
{ bdbuf_test1_4_main },
{ bdbuf_test1_5_main },
-
+
{ bdbuf_test2_1_main },
{ bdbuf_test2_2_main },
-
+
{ bdbuf_test3_1_main },
{ bdbuf_test3_2_main },
{ bdbuf_test3_3_main },
-
+
{ bdbuf_test4_1_main },
{ bdbuf_test4_2_main },
{ bdbuf_test4_3_main },
@@ -88,7 +88,7 @@ bdbuf_test_start_aux_task(rtems_name name,
printf("Failed to create task\n");
return rc;
}
-
+
rc = rtems_task_start(task_id, entry_point, arg);
if (rc != RTEMS_SUCCESSFUL)
{
@@ -126,7 +126,7 @@ run_bdbuf_tests()
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create message queue for test task: %u\n", sc);
+ printf("Failed to create message queue for test task: %u\n", sc);
return;
}
@@ -134,14 +134,14 @@ run_bdbuf_tests()
sc = rtems_io_register_driver(0, &testdisk, &major);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to register TEST DEVICE: %d\n", sc);
+ printf("Failed to register TEST DEVICE: %d\n", sc);
return;
}
test_dev = -1;
while ((disk = rtems_disk_next(dev)) != NULL)
{
- printk(
+ printf(
"DEV: %s [%" PRIdrtems_blkdev_bnum "]\n",
disk->name,
disk->size
@@ -185,7 +185,7 @@ run_bdbuf_tests()
&g_test_ctx.test_sync_main[i]);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create sync sem for test task: %u\n", sc);
+ printf("Failed to create sync sem for test task: %u\n", sc);
return;
}
}
@@ -197,17 +197,17 @@ run_bdbuf_tests()
&g_test_ctx.test_sync[i]);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create sync sem for test task #%d: %u\n", i + 1, sc);
+ printf("Failed to create sync sem for test task #%d: %u\n", i + 1, sc);
return;
}
}
-
+
sc = rtems_semaphore_create(rtems_build_name('T', 'S', 'M', 'E'),
0, TEST_SEM_ATTRIBS, 0,
&g_test_ctx.test_end_main);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to create end sync sem for test task: %u\n", sc);
+ printf("Failed to create end sync sem for test task: %u\n", sc);
return;
}
@@ -249,7 +249,7 @@ bdbuf_test_start_thread(unsigned int idx, rtems_task_entry func)
sc = rtems_task_delete(g_test_ctx.test_task[idx]);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to delete test thread %u in test %s\n",
+ printf("Failed to delete test thread %u in test %s\n",
idx + 1, g_test_ctx.test_name);
return sc;
}
@@ -275,11 +275,10 @@ bdbuf_test_end()
RTEMS_WAIT, RTEMS_NO_TIMEOUT);
if (sc != RTEMS_SUCCESSFUL)
{
- printk("Failed to get a thread stopped\n");
+ printf("Failed to get a thread stopped\n");
}
g_test_ctx.test_task[i] = OBJECTS_ID_NONE;
}
}
return RTEMS_SUCCESSFUL;
}
-
diff --git a/testsuites/libtests/block08/init.c b/testsuites/libtests/block08/init.c
index 83eaf6d534..e712b07f42 100644
--- a/testsuites/libtests/block08/init.c
+++ b/testsuites/libtests/block08/init.c
@@ -19,6 +19,8 @@
#include "config.h"
#endif
+#define TEST_INIT
+
#include "tmacros.h"
#define CONFIGURE_INIT
diff --git a/testsuites/libtests/block08/test_disk.c b/testsuites/libtests/block08/test_disk.c
index 9a4c5bf2b1..aa33803b23 100644
--- a/testsuites/libtests/block08/test_disk.c
+++ b/testsuites/libtests/block08/test_disk.c
@@ -46,19 +46,19 @@ test_disk_ioctl(rtems_disk_device *dd, uint32_t req, void *argp)
r = argp;
- printk("DISK_DRV: %s ",
+ printf("DISK_DRV: %s ",
r->req == RTEMS_BLKDEV_REQ_READ ? "R" :
r->req == RTEMS_BLKDEV_REQ_WRITE ? "W" : "?");
for (i = 0, sg = r->bufs; i < r->bufnum; i++, sg++)
{
- printk("[%" PRIu32 "] ", sg->block);
+ printf("[%" PRIu32 "] ", sg->block);
}
- printk("\n");
+ printf("\n");
break;
}
default:
- printk("%s() Unexpected request comes %" PRIu32 "\n",
+ printf("%s() Unexpected request comes %" PRIu32 "\n",
__FUNCTION__, req);
return -1;
}
@@ -135,7 +135,7 @@ test_disk_initialize(
rc = bdbuf_test_create_drv_rx_queue(&drvq_id);
if (rc != RTEMS_SUCCESSFUL)
{
- printk("%s() Failed to create Msg Queue for RX: %u\n",
+ printf("%s() Failed to create Msg Queue for RX: %u\n",
__FUNCTION__, rc);
return rc;
}
@@ -148,6 +148,6 @@ test_disk_initialize(
return rc;
}
- printk("TEST DISK - OK\n");
+ printf("TEST DISK - OK\n");
return RTEMS_SUCCESSFUL;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 00:26:44 +0000