diff mbox

[PATCHv4,1/2] validation: rename executable to match modules

Message ID 1430124804-3928-1-git-send-email-christophe.milard@linaro.org
State New
Headers show

Commit Message

Christophe Milard April 27, 2015, 8:53 a.m. UTC 
Just the executables whose contents already matched a module have been
renamed. Module names are taken from doxygens defgroup

Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
---

v3/v4 delta: fixed odp_scheduler.c warnings (had too old version of check-odp... thanks Mike)

 test/validation/.gitignore                           |  6 +++---
 test/validation/Makefile.am                          | 16 ++++++++--------
 test/validation/{odp_pktio.c => odp_packet_io.c}     |  0
 test/validation/{odp_pktio_run => odp_packet_io_run} |  4 ++--
 test/validation/{odp_schedule.c => odp_scheduler.c}  |  3 +--
 test/validation/{odp_shm.c => odp_shared_memory.c}   |  0
 6 files changed, 14 insertions(+), 15 deletions(-)
 rename test/validation/{odp_pktio.c => odp_packet_io.c} (100%)
 rename test/validation/{odp_pktio_run => odp_packet_io_run} (98%)
 rename test/validation/{odp_schedule.c => odp_scheduler.c} (99%)
 rename test/validation/{odp_shm.c => odp_shared_memory.c} (100%)

diff --git a/test/validation/odp_shm.c b/test/validation/odp_shared_memory.c
similarity index 100%
rename from test/validation/odp_shm.c
rename to test/validation/odp_shared_memory.c

Comments

Mike Holmes May 1, 2015, 1:24 p.m. UTC | #1 
On 27 April 2015 at 04:53, Christophe Milard <christophe.milard@linaro.org>
wrote:

> Just the executables whose contents already matched a module have been
> renamed. Module names are taken from doxygens defgroup
>
> Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
>

Reviewed-by: Mike Holmes <mike.holmes@linaro.org>


> ---
>
> v3/v4 delta: fixed odp_scheduler.c warnings (had too old version of
> check-odp... thanks Mike)
>
>  test/validation/.gitignore                           |  6 +++---
>  test/validation/Makefile.am                          | 16 ++++++++--------
>  test/validation/{odp_pktio.c => odp_packet_io.c}     |  0
>  test/validation/{odp_pktio_run => odp_packet_io_run} |  4 ++--
>  test/validation/{odp_schedule.c => odp_scheduler.c}  |  3 +--
>  test/validation/{odp_shm.c => odp_shared_memory.c}   |  0
>  6 files changed, 14 insertions(+), 15 deletions(-)
>  rename test/validation/{odp_pktio.c => odp_packet_io.c} (100%)
>  rename test/validation/{odp_pktio_run => odp_packet_io_run} (98%)
>  rename test/validation/{odp_schedule.c => odp_scheduler.c} (99%)
>  rename test/validation/{odp_shm.c => odp_shared_memory.c} (100%)
>
> diff --git a/test/validation/.gitignore b/test/validation/.gitignore
> index cd27c92..05a7424 100644
> --- a/test/validation/.gitignore
> +++ b/test/validation/.gitignore
> @@ -9,12 +9,12 @@ odp_init
>  odp_init_abort
>  odp_init_log
>  odp_packet
> -odp_pktio
> +odp_packet_io
>  odp_pool
>  odp_queue
>  odp_random
> -odp_schedule
> -odp_shm
> +odp_scheduler
> +odp_shared_memory
>  odp_synchronizers
>  odp_system
>  odp_time
> diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
> index 6bac101..36b0ba8 100644
> --- a/test/validation/Makefile.am
> +++ b/test/validation/Makefile.am
> @@ -16,8 +16,8 @@ EXECUTABLES = odp_buffer \
>               odp_pool \
>               odp_queue \
>               odp_random \
> -             odp_schedule \
> -             odp_shm \
> +             odp_scheduler \
> +             odp_shared_memory \
>               odp_system \
>               odp_synchronizers \
>               odp_time \
> @@ -25,15 +25,15 @@ EXECUTABLES = odp_buffer \
>               odp_errno \
>               odp_thread
>
> -COMPILE_ONLY = odp_pktio
> +COMPILE_ONLY = odp_packet_io
>
> -TESTSCRIPTS = odp_pktio_run
> +TESTSCRIPTS = odp_packet_io_run
>
>  if test_vald
>  TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
>  endif
>
> -dist_bin_SCRIPTS = odp_pktio_run
> +dist_bin_SCRIPTS = odp_packet_io_run
>
>  bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
>
> @@ -53,13 +53,13 @@ dist_odp_init_abort_SOURCES = odp_init_abort.c
>  dist_odp_init_log_SOURCES = odp_init_log.c
>  dist_odp_queue_SOURCES = odp_queue.c $(ODP_CU_COMMON)
>  dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON)
> -dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON)
> -dist_odp_shm_SOURCES   = odp_shm.c $(ODP_CU_COMMON)
> +dist_odp_scheduler_SOURCES = odp_scheduler.c $(ODP_CU_COMMON)
> +dist_odp_shared_memory_SOURCES = odp_shared_memory.c $(ODP_CU_COMMON)
>  dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)
>  dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON)
>  dist_odp_time_SOURCES   = odp_time.c $(ODP_CU_COMMON)
>  dist_odp_timer_SOURCES  = odp_timer.c $(ODP_CU_COMMON)
> -dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON)
> +dist_odp_packet_io_SOURCES     = odp_packet_io.c $(ODP_CU_COMMON)
>  dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON)
>  dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON)
>  dist_odp_errno_SOURCES = odp_errno.c $(ODP_CU_COMMON)
> diff --git a/test/validation/odp_pktio.c b/test/validation/odp_packet_io.c
> similarity index 100%
> rename from test/validation/odp_pktio.c
> rename to test/validation/odp_packet_io.c
> diff --git a/test/validation/odp_pktio_run
> b/test/validation/odp_packet_io_run
> similarity index 98%
> rename from test/validation/odp_pktio_run
> rename to test/validation/odp_packet_io_run
> index b6a72c7..73efdca 100755
> --- a/test/validation/odp_pktio_run
> +++ b/test/validation/odp_packet_io_run
> @@ -61,7 +61,7 @@ run_test()
>                 if [ "$disabletype" != "SKIP" ]; then
>                         export ODP_PKTIO_DISABLE_SOCKET_${distype}=y
>                 fi
> -               odp_pktio
> +               odp_packet_io
>                 if [ $? -ne 0 ]; then
>                         ret=1
>                 fi
> @@ -78,7 +78,7 @@ run()
>  {
>         if [ "$ODP_PLATFORM" != "linux-generic" -o "$(id -u)" != "0" ];
> then
>                 echo "pktio: using 'loop' device"
> -               odp_pktio
> +               odp_packet_io
>                 exit $?
>         fi
>
> diff --git a/test/validation/odp_schedule.c
> b/test/validation/odp_scheduler.c
> similarity index 99%
> rename from test/validation/odp_schedule.c
> rename to test/validation/odp_scheduler.c
> index b168766..667c16b 100644
> --- a/test/validation/odp_schedule.c
> +++ b/test/validation/odp_scheduler.c
> @@ -757,9 +757,8 @@ static int schd_suite_term(void)
>         }
>
>         pool = odp_pool_lookup(MSG_POOL_NAME);
> -       if (odp_pool_destroy(pool) != 0) {
> +       if (odp_pool_destroy(pool) != 0)
>                 fprintf(stderr, "error: failed to destroy pool\n");
> -       }
>
>         return 0;
>  }
> diff --git a/test/validation/odp_shm.c
> b/test/validation/odp_shared_memory.c
> similarity index 100%
> rename from test/validation/odp_shm.c
> rename to test/validation/odp_shared_memory.c
> --
> 1.9.1
>
>
Maxim Uvarov May 5, 2015, 9:15 a.m. UTC | #2 
2 comments bellow

On 04/27/2015 11:53, Christophe Milard wrote:
> Just the executables whose contents already matched a module have been
> renamed. Module names are taken from doxygens defgroup
>
> Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
> ---
>
> v3/v4 delta: fixed odp_scheduler.c warnings (had too old version of check-odp... thanks Mike)
>
>   test/validation/.gitignore                           |  6 +++---
>   test/validation/Makefile.am                          | 16 ++++++++--------
>   test/validation/{odp_pktio.c => odp_packet_io.c}     |  0
>   test/validation/{odp_pktio_run => odp_packet_io_run} |  4 ++--
>   test/validation/{odp_schedule.c => odp_scheduler.c}  |  3 +--
>   test/validation/{odp_shm.c => odp_shared_memory.c}   |  0
>   6 files changed, 14 insertions(+), 15 deletions(-)
>   rename test/validation/{odp_pktio.c => odp_packet_io.c} (100%)
>   rename test/validation/{odp_pktio_run => odp_packet_io_run} (98%)
>   rename test/validation/{odp_schedule.c => odp_scheduler.c} (99%)
>   rename test/validation/{odp_shm.c => odp_shared_memory.c} (100%)
>
> diff --git a/test/validation/.gitignore b/test/validation/.gitignore
> index cd27c92..05a7424 100644
> --- a/test/validation/.gitignore
> +++ b/test/validation/.gitignore
> @@ -9,12 +9,12 @@ odp_init
>   odp_init_abort
>   odp_init_log
>   odp_packet
> -odp_pktio
> +odp_packet_io

odp_pktio is known prefix for all pktio subsystem. I think it's better 
to stay with pktio name than packet_io.
>   odp_pool
>   odp_queue
>   odp_random
> -odp_schedule
> -odp_shm
> +odp_scheduler
> +odp_shared_memory
>   odp_synchronizers
>   odp_system
>   odp_time
> diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
> index 6bac101..36b0ba8 100644
> --- a/test/validation/Makefile.am
> +++ b/test/validation/Makefile.am
> @@ -16,8 +16,8 @@ EXECUTABLES = odp_buffer \
>   	      odp_pool \
>   	      odp_queue \
>   	      odp_random \
> -	      odp_schedule \
> -	      odp_shm \
> +	      odp_scheduler \
> +	      odp_shared_memory \
>   	      odp_system \
>   	      odp_synchronizers \
>   	      odp_time \
> @@ -25,15 +25,15 @@ EXECUTABLES = odp_buffer \
>   	      odp_errno \
>   	      odp_thread
>   
> -COMPILE_ONLY = odp_pktio
> +COMPILE_ONLY = odp_packet_io
>   
> -TESTSCRIPTS = odp_pktio_run
> +TESTSCRIPTS = odp_packet_io_run
>   
>   if test_vald
>   TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
>   endif
>   
> -dist_bin_SCRIPTS = odp_pktio_run
> +dist_bin_SCRIPTS = odp_packet_io_run
>   
>   bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
>   
> @@ -53,13 +53,13 @@ dist_odp_init_abort_SOURCES = odp_init_abort.c
>   dist_odp_init_log_SOURCES = odp_init_log.c
>   dist_odp_queue_SOURCES	= odp_queue.c $(ODP_CU_COMMON)
>   dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON)
> -dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON)
> -dist_odp_shm_SOURCES	= odp_shm.c $(ODP_CU_COMMON)
> +dist_odp_scheduler_SOURCES = odp_scheduler.c $(ODP_CU_COMMON)
> +dist_odp_shared_memory_SOURCES	= odp_shared_memory.c $(ODP_CU_COMMON)
>   dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)
>   dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON)
>   dist_odp_time_SOURCES   = odp_time.c $(ODP_CU_COMMON)
>   dist_odp_timer_SOURCES  = odp_timer.c $(ODP_CU_COMMON)
> -dist_odp_pktio_SOURCES	= odp_pktio.c $(ODP_CU_COMMON)
> +dist_odp_packet_io_SOURCES	= odp_packet_io.c $(ODP_CU_COMMON)
>   dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON)
>   dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON)
>   dist_odp_errno_SOURCES = odp_errno.c $(ODP_CU_COMMON)
> diff --git a/test/validation/odp_pktio.c b/test/validation/odp_packet_io.c
> similarity index 100%
> rename from test/validation/odp_pktio.c
> rename to test/validation/odp_packet_io.c
> diff --git a/test/validation/odp_pktio_run b/test/validation/odp_packet_io_run
> similarity index 98%
> rename from test/validation/odp_pktio_run
> rename to test/validation/odp_packet_io_run
> index b6a72c7..73efdca 100755
> --- a/test/validation/odp_pktio_run
> +++ b/test/validation/odp_packet_io_run
> @@ -61,7 +61,7 @@ run_test()
>   		if [ "$disabletype" != "SKIP" ]; then
>   			export ODP_PKTIO_DISABLE_SOCKET_${distype}=y
>   		fi
> -		odp_pktio
> +		odp_packet_io
>   		if [ $? -ne 0 ]; then
>   			ret=1
>   		fi
> @@ -78,7 +78,7 @@ run()
>   {
>   	if [ "$ODP_PLATFORM" != "linux-generic" -o "$(id -u)" != "0" ]; then
>   		echo "pktio: using 'loop' device"
> -		odp_pktio
> +		odp_packet_io
>   		exit $?
>   	fi
>   
> diff --git a/test/validation/odp_schedule.c b/test/validation/odp_scheduler.c
> similarity index 99%
> rename from test/validation/odp_schedule.c
> rename to test/validation/odp_scheduler.c
> index b168766..667c16b 100644
> --- a/test/validation/odp_schedule.c
> +++ b/test/validation/odp_scheduler.c
> @@ -757,9 +757,8 @@ static int schd_suite_term(void)
>   	}
>   
>   	pool = odp_pool_lookup(MSG_POOL_NAME);
> -	if (odp_pool_destroy(pool) != 0) {
> +	if (odp_pool_destroy(pool) != 0)
>   		fprintf(stderr, "error: failed to destroy pool\n");
> -	}
>   
>   	return 0;
>   }
Please remove above chunk from patch. There is nothing about rename and 
it's better to not
touch explicit braces if they are already in the code.

Thanks,
Maxim.
> diff --git a/test/validation/odp_shm.c b/test/validation/odp_shared_memory.c
> similarity index 100%
> rename from test/validation/odp_shm.c
> rename to test/validation/odp_shared_memory.c
Christophe Milard May 5, 2015, 11:04 a.m. UTC | #3 
On 5 May 2015 at 11:15, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:

> 2 comments bellow
>
>
> On 04/27/2015 11:53, Christophe Milard wrote:
>
>> Just the executables whose contents already matched a module have been
>> renamed. Module names are taken from doxygens defgroup
>>
>> Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
>> ---
>>
>> v3/v4 delta: fixed odp_scheduler.c warnings (had too old version of
>> check-odp... thanks Mike)
>>
>>   test/validation/.gitignore                           |  6 +++---
>>   test/validation/Makefile.am                          | 16
>> ++++++++--------
>>   test/validation/{odp_pktio.c => odp_packet_io.c}     |  0
>>   test/validation/{odp_pktio_run => odp_packet_io_run} |  4 ++--
>>   test/validation/{odp_schedule.c => odp_scheduler.c}  |  3 +--
>>   test/validation/{odp_shm.c => odp_shared_memory.c}   |  0
>>   6 files changed, 14 insertions(+), 15 deletions(-)
>>   rename test/validation/{odp_pktio.c => odp_packet_io.c} (100%)
>>   rename test/validation/{odp_pktio_run => odp_packet_io_run} (98%)
>>   rename test/validation/{odp_schedule.c => odp_scheduler.c} (99%)
>>   rename test/validation/{odp_shm.c => odp_shared_memory.c} (100%)
>>
>> diff --git a/test/validation/.gitignore b/test/validation/.gitignore
>> index cd27c92..05a7424 100644
>> --- a/test/validation/.gitignore
>> +++ b/test/validation/.gitignore
>> @@ -9,12 +9,12 @@ odp_init
>>   odp_init_abort
>>   odp_init_log
>>   odp_packet
>> -odp_pktio
>> +odp_packet_io
>>
>
> odp_pktio is known prefix for all pktio subsystem. I think it's better to
> stay with pktio name than packet_io.


The idea is to have names matching module names as given in doxygen


>
>    odp_pool
>>   odp_queue
>>   odp_random
>> -odp_schedule
>> -odp_shm
>> +odp_scheduler
>> +odp_shared_memory
>>   odp_synchronizers
>>   odp_system
>>   odp_time
>> diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
>> index 6bac101..36b0ba8 100644
>> --- a/test/validation/Makefile.am
>> +++ b/test/validation/Makefile.am
>> @@ -16,8 +16,8 @@ EXECUTABLES = odp_buffer \
>>               odp_pool \
>>               odp_queue \
>>               odp_random \
>> -             odp_schedule \
>> -             odp_shm \
>> +             odp_scheduler \
>> +             odp_shared_memory \
>>               odp_system \
>>               odp_synchronizers \
>>               odp_time \
>> @@ -25,15 +25,15 @@ EXECUTABLES = odp_buffer \
>>               odp_errno \
>>               odp_thread
>>   -COMPILE_ONLY = odp_pktio
>> +COMPILE_ONLY = odp_packet_io
>>   -TESTSCRIPTS = odp_pktio_run
>> +TESTSCRIPTS = odp_packet_io_run
>>     if test_vald
>>   TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
>>   endif
>>   -dist_bin_SCRIPTS = odp_pktio_run
>> +dist_bin_SCRIPTS = odp_packet_io_run
>>     bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
>>   @@ -53,13 +53,13 @@ dist_odp_init_abort_SOURCES = odp_init_abort.c
>>   dist_odp_init_log_SOURCES = odp_init_log.c
>>   dist_odp_queue_SOURCES        = odp_queue.c $(ODP_CU_COMMON)
>>   dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON)
>> -dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON)
>> -dist_odp_shm_SOURCES   = odp_shm.c $(ODP_CU_COMMON)
>> +dist_odp_scheduler_SOURCES = odp_scheduler.c $(ODP_CU_COMMON)
>> +dist_odp_shared_memory_SOURCES = odp_shared_memory.c $(ODP_CU_COMMON)
>>   dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)
>>   dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON)
>>   dist_odp_time_SOURCES   = odp_time.c $(ODP_CU_COMMON)
>>   dist_odp_timer_SOURCES  = odp_timer.c $(ODP_CU_COMMON)
>> -dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON)
>> +dist_odp_packet_io_SOURCES     = odp_packet_io.c $(ODP_CU_COMMON)
>>   dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON)
>>   dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON)
>>   dist_odp_errno_SOURCES = odp_errno.c $(ODP_CU_COMMON)
>> diff --git a/test/validation/odp_pktio.c b/test/validation/odp_packet_io.c
>> similarity index 100%
>> rename from test/validation/odp_pktio.c
>> rename to test/validation/odp_packet_io.c
>> diff --git a/test/validation/odp_pktio_run
>> b/test/validation/odp_packet_io_run
>> similarity index 98%
>> rename from test/validation/odp_pktio_run
>> rename to test/validation/odp_packet_io_run
>> index b6a72c7..73efdca 100755
>> --- a/test/validation/odp_pktio_run
>> +++ b/test/validation/odp_packet_io_run
>> @@ -61,7 +61,7 @@ run_test()
>>                 if [ "$disabletype" != "SKIP" ]; then
>>                         export ODP_PKTIO_DISABLE_SOCKET_${distype}=y
>>                 fi
>> -               odp_pktio
>> +               odp_packet_io
>>                 if [ $? -ne 0 ]; then
>>                         ret=1
>>                 fi
>> @@ -78,7 +78,7 @@ run()
>>   {
>>         if [ "$ODP_PLATFORM" != "linux-generic" -o "$(id -u)" != "0" ];
>> then
>>                 echo "pktio: using 'loop' device"
>> -               odp_pktio
>> +               odp_packet_io
>>                 exit $?
>>         fi
>>   diff --git a/test/validation/odp_schedule.c
>> b/test/validation/odp_scheduler.c
>> similarity index 99%
>> rename from test/validation/odp_schedule.c
>> rename to test/validation/odp_scheduler.c
>> index b168766..667c16b 100644
>> --- a/test/validation/odp_schedule.c
>> +++ b/test/validation/odp_scheduler.c
>> @@ -757,9 +757,8 @@ static int schd_suite_term(void)
>>         }
>>         pool = odp_pool_lookup(MSG_POOL_NAME);
>> -       if (odp_pool_destroy(pool) != 0) {
>> +       if (odp_pool_destroy(pool) != 0)
>>                 fprintf(stderr, "error: failed to destroy pool\n");
>> -       }
>>         return 0;
>>   }
>>
> Please remove above chunk from patch. There is nothing about rename and
> it's better to not
> touch explicit braces if they are already in the code.
>

correct, but check-odp catches it. so this follows a remark from Mike...


>
> Thanks,
> Maxim.
>
>  diff --git a/test/validation/odp_shm.c
>> b/test/validation/odp_shared_memory.c
>> similarity index 100%
>> rename from test/validation/odp_shm.c
>> rename to test/validation/odp_shared_memory.c
>>
>
>
Mike Holmes May 5, 2015, 12:08 p.m. UTC | #4 
On 5 May 2015 at 07:04, Christophe Milard <christophe.milard@linaro.org>
wrote:

>
>
> On 5 May 2015 at 11:15, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
>
>> 2 comments bellow
>>
>>
>> On 04/27/2015 11:53, Christophe Milard wrote:
>>
>>> Just the executables whose contents already matched a module have been
>>> renamed. Module names are taken from doxygens defgroup
>>>
>>> Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
>>> ---
>>>
>>> v3/v4 delta: fixed odp_scheduler.c warnings (had too old version of
>>> check-odp... thanks Mike)
>>>
>>>   test/validation/.gitignore                           |  6 +++---
>>>   test/validation/Makefile.am                          | 16
>>> ++++++++--------
>>>   test/validation/{odp_pktio.c => odp_packet_io.c}     |  0
>>>   test/validation/{odp_pktio_run => odp_packet_io_run} |  4 ++--
>>>   test/validation/{odp_schedule.c => odp_scheduler.c}  |  3 +--
>>>   test/validation/{odp_shm.c => odp_shared_memory.c}   |  0
>>>   6 files changed, 14 insertions(+), 15 deletions(-)
>>>   rename test/validation/{odp_pktio.c => odp_packet_io.c} (100%)
>>>   rename test/validation/{odp_pktio_run => odp_packet_io_run} (98%)
>>>   rename test/validation/{odp_schedule.c => odp_scheduler.c} (99%)
>>>   rename test/validation/{odp_shm.c => odp_shared_memory.c} (100%)
>>>
>>> diff --git a/test/validation/.gitignore b/test/validation/.gitignore
>>> index cd27c92..05a7424 100644
>>> --- a/test/validation/.gitignore
>>> +++ b/test/validation/.gitignore
>>> @@ -9,12 +9,12 @@ odp_init
>>>   odp_init_abort
>>>   odp_init_log
>>>   odp_packet
>>> -odp_pktio
>>> +odp_packet_io
>>>
>>
>> odp_pktio is known prefix for all pktio subsystem. I think it's better to
>> stay with pktio name than packet_io.
>
>
> The idea is to have names matching module names as given in doxygen
>

The use of the name to refer to packet io needs to be rationalized, we can
add a patch to line them up separately but the test must be aligned with
the name of the API Module in the API_DOC
<http://docs.opendataplane.org/linux-generic-doxygen-html/modules.html>

So we need to do this now becasue the test are incorrectly named currently.


>
>
>>
>>    odp_pool
>>>   odp_queue
>>>   odp_random
>>> -odp_schedule
>>> -odp_shm
>>> +odp_scheduler
>>> +odp_shared_memory
>>>   odp_synchronizers
>>>   odp_system
>>>   odp_time
>>> diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
>>> index 6bac101..36b0ba8 100644
>>> --- a/test/validation/Makefile.am
>>> +++ b/test/validation/Makefile.am
>>> @@ -16,8 +16,8 @@ EXECUTABLES = odp_buffer \
>>>               odp_pool \
>>>               odp_queue \
>>>               odp_random \
>>> -             odp_schedule \
>>> -             odp_shm \
>>> +             odp_scheduler \
>>> +             odp_shared_memory \
>>>               odp_system \
>>>               odp_synchronizers \
>>>               odp_time \
>>> @@ -25,15 +25,15 @@ EXECUTABLES = odp_buffer \
>>>               odp_errno \
>>>               odp_thread
>>>   -COMPILE_ONLY = odp_pktio
>>> +COMPILE_ONLY = odp_packet_io
>>>   -TESTSCRIPTS = odp_pktio_run
>>> +TESTSCRIPTS = odp_packet_io_run
>>>     if test_vald
>>>   TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
>>>   endif
>>>   -dist_bin_SCRIPTS = odp_pktio_run
>>> +dist_bin_SCRIPTS = odp_packet_io_run
>>>     bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
>>>   @@ -53,13 +53,13 @@ dist_odp_init_abort_SOURCES = odp_init_abort.c
>>>   dist_odp_init_log_SOURCES = odp_init_log.c
>>>   dist_odp_queue_SOURCES        = odp_queue.c $(ODP_CU_COMMON)
>>>   dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON)
>>> -dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON)
>>> -dist_odp_shm_SOURCES   = odp_shm.c $(ODP_CU_COMMON)
>>> +dist_odp_scheduler_SOURCES = odp_scheduler.c $(ODP_CU_COMMON)
>>> +dist_odp_shared_memory_SOURCES = odp_shared_memory.c $(ODP_CU_COMMON)
>>>   dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)
>>>   dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON)
>>>   dist_odp_time_SOURCES   = odp_time.c $(ODP_CU_COMMON)
>>>   dist_odp_timer_SOURCES  = odp_timer.c $(ODP_CU_COMMON)
>>> -dist_odp_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON)
>>> +dist_odp_packet_io_SOURCES     = odp_packet_io.c $(ODP_CU_COMMON)
>>>   dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON)
>>>   dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON)
>>>   dist_odp_errno_SOURCES = odp_errno.c $(ODP_CU_COMMON)
>>> diff --git a/test/validation/odp_pktio.c
>>> b/test/validation/odp_packet_io.c
>>> similarity index 100%
>>> rename from test/validation/odp_pktio.c
>>> rename to test/validation/odp_packet_io.c
>>> diff --git a/test/validation/odp_pktio_run
>>> b/test/validation/odp_packet_io_run
>>> similarity index 98%
>>> rename from test/validation/odp_pktio_run
>>> rename to test/validation/odp_packet_io_run
>>> index b6a72c7..73efdca 100755
>>> --- a/test/validation/odp_pktio_run
>>> +++ b/test/validation/odp_packet_io_run
>>> @@ -61,7 +61,7 @@ run_test()
>>>                 if [ "$disabletype" != "SKIP" ]; then
>>>                         export ODP_PKTIO_DISABLE_SOCKET_${distype}=y
>>>                 fi
>>> -               odp_pktio
>>> +               odp_packet_io
>>>                 if [ $? -ne 0 ]; then
>>>                         ret=1
>>>                 fi
>>> @@ -78,7 +78,7 @@ run()
>>>   {
>>>         if [ "$ODP_PLATFORM" != "linux-generic" -o "$(id -u)" != "0" ];
>>> then
>>>                 echo "pktio: using 'loop' device"
>>> -               odp_pktio
>>> +               odp_packet_io
>>>                 exit $?
>>>         fi
>>>   diff --git a/test/validation/odp_schedule.c
>>> b/test/validation/odp_scheduler.c
>>> similarity index 99%
>>> rename from test/validation/odp_schedule.c
>>> rename to test/validation/odp_scheduler.c
>>> index b168766..667c16b 100644
>>> --- a/test/validation/odp_schedule.c
>>> +++ b/test/validation/odp_scheduler.c
>>> @@ -757,9 +757,8 @@ static int schd_suite_term(void)
>>>         }
>>>         pool = odp_pool_lookup(MSG_POOL_NAME);
>>> -       if (odp_pool_destroy(pool) != 0) {
>>> +       if (odp_pool_destroy(pool) != 0)
>>>                 fprintf(stderr, "error: failed to destroy pool\n");
>>> -       }
>>>         return 0;
>>>   }
>>>
>> Please remove above chunk from patch. There is nothing about rename and
>> it's better to not
>> touch explicit braces if they are already in the code.
>>
>
> correct, but check-odp catches it. so this follows a remark from Mike...
>

check-odp must be clean for brace warnings.


>
>
>>
>> Thanks,
>> Maxim.
>>
>>  diff --git a/test/validation/odp_shm.c
>>> b/test/validation/odp_shared_memory.c
>>> similarity index 100%
>>> rename from test/validation/odp_shm.c
>>> rename to test/validation/odp_shared_memory.c
>>>
>>
>>
>
diff mbox

Patch

diff --git a/test/validation/.gitignore b/test/validation/.gitignore
index cd27c92..05a7424 100644
--- a/test/validation/.gitignore
+++ b/test/validation/.gitignore
@@ -9,12 +9,12 @@  odp_init
 odp_init_abort
 odp_init_log
 odp_packet
-odp_pktio
+odp_packet_io
 odp_pool
 odp_queue
 odp_random
-odp_schedule
-odp_shm
+odp_scheduler
+odp_shared_memory
 odp_synchronizers
 odp_system
 odp_time
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am
index 6bac101..36b0ba8 100644
--- a/test/validation/Makefile.am
+++ b/test/validation/Makefile.am
@@ -16,8 +16,8 @@  EXECUTABLES = odp_buffer \
 	      odp_pool \
 	      odp_queue \
 	      odp_random \
-	      odp_schedule \
-	      odp_shm \
+	      odp_scheduler \
+	      odp_shared_memory \
 	      odp_system \
 	      odp_synchronizers \
 	      odp_time \
@@ -25,15 +25,15 @@  EXECUTABLES = odp_buffer \
 	      odp_errno \
 	      odp_thread
 
-COMPILE_ONLY = odp_pktio
+COMPILE_ONLY = odp_packet_io
 
-TESTSCRIPTS = odp_pktio_run
+TESTSCRIPTS = odp_packet_io_run
 
 if test_vald
 TESTS = $(EXECUTABLES) $(TESTSCRIPTS)
 endif
 
-dist_bin_SCRIPTS = odp_pktio_run
+dist_bin_SCRIPTS = odp_packet_io_run
 
 bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
 
@@ -53,13 +53,13 @@  dist_odp_init_abort_SOURCES = odp_init_abort.c
 dist_odp_init_log_SOURCES = odp_init_log.c
 dist_odp_queue_SOURCES	= odp_queue.c $(ODP_CU_COMMON)
 dist_odp_random_SOURCES = odp_random.c $(ODP_CU_COMMON)
-dist_odp_schedule_SOURCES = odp_schedule.c $(ODP_CU_COMMON)
-dist_odp_shm_SOURCES	= odp_shm.c $(ODP_CU_COMMON)
+dist_odp_scheduler_SOURCES = odp_scheduler.c $(ODP_CU_COMMON)
+dist_odp_shared_memory_SOURCES	= odp_shared_memory.c $(ODP_CU_COMMON)
 dist_odp_system_SOURCES = odp_system.c $(ODP_CU_COMMON)
 dist_odp_synchronizers_SOURCES = odp_synchronizers.c $(ODP_CU_COMMON)
 dist_odp_time_SOURCES   = odp_time.c $(ODP_CU_COMMON)
 dist_odp_timer_SOURCES  = odp_timer.c $(ODP_CU_COMMON)
-dist_odp_pktio_SOURCES	= odp_pktio.c $(ODP_CU_COMMON)
+dist_odp_packet_io_SOURCES	= odp_packet_io.c $(ODP_CU_COMMON)
 dist_odp_packet_SOURCES = odp_packet.c $(ODP_CU_COMMON)
 dist_odp_pool_SOURCES = odp_pool.c $(ODP_CU_COMMON)
 dist_odp_errno_SOURCES = odp_errno.c $(ODP_CU_COMMON)
diff --git a/test/validation/odp_pktio.c b/test/validation/odp_packet_io.c
similarity index 100%
rename from test/validation/odp_pktio.c
rename to test/validation/odp_packet_io.c
diff --git a/test/validation/odp_pktio_run b/test/validation/odp_packet_io_run
similarity index 98%
rename from test/validation/odp_pktio_run
rename to test/validation/odp_packet_io_run
index b6a72c7..73efdca 100755
--- a/test/validation/odp_pktio_run
+++ b/test/validation/odp_packet_io_run
@@ -61,7 +61,7 @@  run_test()
 		if [ "$disabletype" != "SKIP" ]; then
 			export ODP_PKTIO_DISABLE_SOCKET_${distype}=y
 		fi
-		odp_pktio
+		odp_packet_io
 		if [ $? -ne 0 ]; then
 			ret=1
 		fi
@@ -78,7 +78,7 @@  run()
 {
 	if [ "$ODP_PLATFORM" != "linux-generic" -o "$(id -u)" != "0" ]; then
 		echo "pktio: using 'loop' device"
-		odp_pktio
+		odp_packet_io
 		exit $?
 	fi
 
diff --git a/test/validation/odp_schedule.c b/test/validation/odp_scheduler.c
similarity index 99%
rename from test/validation/odp_schedule.c
rename to test/validation/odp_scheduler.c
index b168766..667c16b 100644
--- a/test/validation/odp_schedule.c
+++ b/test/validation/odp_scheduler.c
@@ -757,9 +757,8 @@  static int schd_suite_term(void)
 	}
 
 	pool = odp_pool_lookup(MSG_POOL_NAME);
-	if (odp_pool_destroy(pool) != 0) {
+	if (odp_pool_destroy(pool) != 0)
 		fprintf(stderr, "error: failed to destroy pool\n");
-	}
 
 	return 0;
 }