RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

testsuite: Fix printk format warnings.

Browse Source
This commit is contained in:
Chris Johns
2016-05-23 15:29:49 +10:00
parent 61ea345158
commit addf1aa868
17 changed files with 94 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
testsuites/libtests/block08/bdbuf_test1_1.c
View File

@@ -91,7 +91,7 @@ bdbuf_test1_1_main()
CONTINUE_THREAD(1); CONTINUE_THREAD(1);
TEST_END(); TEST_STOP();
} }
@@ -147,4 +147,3 @@ bdbuf_test1_1_thread1(rtems_task_argument arg)
THREAD_END(); THREAD_END();
} }

3
testsuites/libtests/block08/bdbuf_test1_2.c
View File

@@ -102,7 +102,7 @@ bdbuf_test1_2_main()
CONTINUE_THREAD(2); CONTINUE_THREAD(2);
TEST_CHECK_RESULT("5"); TEST_CHECK_RESULT("5");
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -160,4 +160,3 @@ bdbuf_test1_2_thread2(rtems_task_argument arg)
THREAD_END(); THREAD_END();
} }

3
testsuites/libtests/block08/bdbuf_test1_3.c
View File

@@ -111,7 +111,7 @@ bdbuf_test1_3_main()
*/ */
CONTINUE_THREAD(2); CONTINUE_THREAD(2);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -176,4 +176,3 @@ bdbuf_test1_3_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

4
testsuites/libtests/block08/bdbuf_test1_4.c
View File

@@ -104,7 +104,7 @@ bdbuf_test1_4_main()
*/ */
CONTINUE_THREAD(2); CONTINUE_THREAD(2);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -177,5 +177,3 @@ bdbuf_test1_4_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

3
testsuites/libtests/block08/bdbuf_test1_5.c
View File

@@ -86,7 +86,7 @@ bdbuf_test1_5_main()
*/ */
CONTINUE_THREAD(2); CONTINUE_THREAD(2);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -145,4 +145,3 @@ bdbuf_test1_5_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

3
testsuites/libtests/block08/bdbuf_test2_1.c
View File

@@ -121,7 +121,7 @@ bdbuf_test2_1_main()
WAIT_DRV_MSG_WR(&msg); WAIT_DRV_MSG_WR(&msg);
SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0); SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -194,4 +194,3 @@ bdbuf_test2_1_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

4
testsuites/libtests/block08/bdbuf_test2_2.c
View File

@@ -121,7 +121,7 @@ bdbuf_test2_2_main()
WAIT_DRV_MSG_WR(&msg); WAIT_DRV_MSG_WR(&msg);
SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0); SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -194,5 +194,3 @@ bdbuf_test2_2_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

4
testsuites/libtests/block08/bdbuf_test3_1.c
View File

@@ -91,7 +91,7 @@ bdbuf_test3_1_main()
WAIT_DRV_MSG_WR(&msg); WAIT_DRV_MSG_WR(&msg);
SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0); SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -182,5 +182,3 @@ bdbuf_test3_1_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

3
testsuites/libtests/block08/bdbuf_test3_2.c
View File

@@ -102,7 +102,7 @@ bdbuf_test3_2_main()
WAIT_DRV_MSG_WR(&msg); WAIT_DRV_MSG_WR(&msg);
SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0); SEND_DRV_MSG(0, 0, RTEMS_SUCCESSFUL, 0);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -196,4 +196,3 @@ bdbuf_test3_2_thread3(rtems_task_argument arg)
THREAD_END(); THREAD_END();
} }

3
testsuites/libtests/block08/bdbuf_test3_3.c
View File

@@ -113,7 +113,7 @@ bdbuf_test3_3_main()
CHECK_NO_DRV_MSG(); CHECK_NO_DRV_MSG();
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -207,4 +207,3 @@ bdbuf_test3_3_thread3(rtems_task_argument arg)
THREAD_END(); THREAD_END();
} }

4
testsuites/libtests/block08/bdbuf_test4_1.c
View File

@@ -107,7 +107,7 @@ bdbuf_test4_1_main()
*/ */
CONTINUE_THREAD(1); CONTINUE_THREAD(1);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -174,5 +174,3 @@ bdbuf_test4_1_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

4
testsuites/libtests/block08/bdbuf_test4_2.c
View File

@@ -94,7 +94,7 @@ bdbuf_test4_2_main()
/* Exit from thread #1 */ /* Exit from thread #1 */
CONTINUE_THREAD(1); CONTINUE_THREAD(1);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -159,5 +159,3 @@ bdbuf_test4_2_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

4
testsuites/libtests/block08/bdbuf_test4_3.c
View File

@@ -88,7 +88,7 @@ bdbuf_test4_3_main()
*/ */
CONTINUE_THREAD(1); CONTINUE_THREAD(1);
TEST_END(); TEST_STOP();
} }
static rtems_task static rtems_task
@@ -153,5 +153,3 @@ bdbuf_test4_3_thread2(rtems_task_argument arg)
} }
THREAD_END(); THREAD_END();
} }

6
testsuites/libtests/block08/bdbuf_tests.h
View File

@@ -12,6 +12,7 @@
#ifndef BDBUF_TESTS_H #ifndef BDBUF_TESTS_H
#define BDBUF_TESTS_H #define BDBUF_TESTS_H
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@@ -264,7 +265,7 @@ extern bool good_test_result;
RTEMS_BLKDEV_REQ_WRITE) \ RTEMS_BLKDEV_REQ_WRITE) \
{ \ { \
printk("Unexpected message received by disk driver: " \ printk("Unexpected message received by disk driver: " \
"req - 0x%x (0x%x), dev - %d (%d)\n", \ "req - 0x%" PRIx32 " (0x%" PRIx32 "), dev - %p (%p)\n", \
(msg_)->val.driver_req.req, RTEMS_BLKIO_REQUEST, \ (msg_)->val.driver_req.req, RTEMS_BLKIO_REQUEST, \
(msg_)->val.driver_req.dd, test_dd); \ (msg_)->val.driver_req.dd, test_dd); \
return; \ return; \
@@ -457,7 +458,7 @@ extern bdbuf_test_msg test_drv_msg;
} \ } \
} while (0) } while (0)
#define TEST_END() \ #define TEST_STOP() \
do { \ do { \
bdbuf_test_end(); \ bdbuf_test_end(); \
\ \
@@ -500,4 +501,3 @@ bdbuf_test_start_aux_task(rtems_name name,
#endif #endif
#endif /* BDBUF_TESTS_H */ #endif /* BDBUF_TESTS_H */

5
testsuites/libtests/block08/test_disk.c
View File

@@ -51,14 +51,14 @@ test_disk_ioctl(rtems_disk_device *dd, uint32_t req, void *argp)
r->req == RTEMS_BLKDEV_REQ_WRITE ? "W" : "?"); r->req == RTEMS_BLKDEV_REQ_WRITE ? "W" : "?");
for (i = 0, sg = r->bufs; i < r->bufnum; i++, sg++) for (i = 0, sg = r->bufs; i < r->bufnum; i++, sg++)
{ {
printk("[%d] ", sg->block); printk("[%" PRIu32 "] ", sg->block);
} }
printk("\n"); printk("\n");
break; break;
} }
default: default:
printk("%s() Unexpected request comes %u\n", printk("%s() Unexpected request comes %" PRIu32 "\n",
__FUNCTION__, req); __FUNCTION__, req);
return -1; return -1;
} }
@@ -151,4 +151,3 @@ test_disk_initialize(
printk("TEST DISK - OK\n"); printk("TEST DISK - OK\n");
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }

2
testsuites/sptests/spfatal_support/init.c
View File

@@ -43,7 +43,7 @@ void Put_Error( uint32_t source, uint32_t error )
} }
else if (source == INTERNAL_ERROR_RTEMS_API ){ else if (source == INTERNAL_ERROR_RTEMS_API ){
if (error > RTEMS_NOT_IMPLEMENTED ) if (error > RTEMS_NOT_IMPLEMENTED )
printk("Unknown Internal Rtems Error (0x%08x)", error); printk("Unknown Internal Rtems Error (0x%08" PRIx32 ")", error);
else else
printk( "%s", rtems_status_text( error ) ); printk( "%s", rtems_status_text( error ) );
} }

12
testsuites/sptests/spprintk/init.c
View File

@@ -13,12 +13,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define TESTS_USE_PRINTK
#include <tmacros.h>
#include <rtems/print.h>
const char rtems_test_name[] = "SPPRINTK";
/* /*
* Undefined the RTEMS_PRINTF_ATTRIBUTE and make it nothing. The test code * Undefined the RTEMS_PRINTF_ATTRIBUTE and make it nothing. The test code
* contained in the file is suppose to be wrong. * contained in the file is suppose to be wrong.
@@ -26,6 +20,12 @@ const char rtems_test_name[] = "SPPRINTK";
#undef RTEMS_PRINTF_ATTRIBUTE #undef RTEMS_PRINTF_ATTRIBUTE
#define RTEMS_PRINTF_ATTRIBUTE(_a, _b) #define RTEMS_PRINTF_ATTRIBUTE(_a, _b)
#define TESTS_USE_PRINTK
#include <tmacros.h>
#include <rtems/print.h>
const char rtems_test_name[] = "SPPRINTK";
/* forward declarations to avoid warnings */ /* forward declarations to avoid warnings */
rtems_task Init(rtems_task_argument argument); rtems_task Init(rtems_task_argument argument);
int test_getchar(void); int test_getchar(void);