| Message ID | 1449757466-6287-5-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
Using patch:
lng-odp_PATCHv17_04-10_helpers_remove_odp_prefix_for_tests_source_files.mbox
Trying to apply patch
Patch applied
Applying: helpers: remove odp_ prefix for tests source files
/home/mike/git/check-odp/build/odp-apply/.git/rebase-apply/patch:47: indent
with spaces.
thread$(EXEEXT) \
/home/mike/git/check-odp/build/odp-apply/.git/rebase-apply/patch:48: indent
with spaces.
process$(EXEEXT)\
/home/mike/git/check-odp/build/odp-apply/.git/rebase-apply/patch:49: indent
with spaces.
pause$(EXEEXT)\
/home/mike/git/check-odp/build/odp-apply/.git/rebase-apply/patch:50: indent
with spaces.
table$(EXEEXT)
warning: 4 lines add whitespace errors.
On 10 December 2015 at 09:24, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
> Prefixed were removed for validation test suite and to
> be consistent we need to do the same for helpers.
>
> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
> ---
> helper/test/.gitignore | 10 +++++-----
> helper/test/Makefile.am | 25 ++++++++++++-------------
> helper/test/{odp_chksum.c => chksum.c} | 3 +--
> helper/test/{odph_pause.c => pause.c} | 0
> helper/test/{odp_process.c => process.c} | 3 ++-
> helper/test/{odp_table.c => table.c} | 1 -
> helper/test/{odp_thread.c => thread.c} | 3 ++-
> 7 files changed, 22 insertions(+), 23 deletions(-)
> rename helper/test/{odp_chksum.c => chksum.c} (98%)
> rename helper/test/{odph_pause.c => pause.c} (100%)
> rename helper/test/{odp_process.c => process.c} (96%)
> rename helper/test/{odp_table.c => table.c} (99%)
> rename helper/test/{odp_thread.c => thread.c} (96%)
>
> diff --git a/helper/test/.gitignore b/helper/test/.gitignore
> index 50a0da4..1984139 100644
> --- a/helper/test/.gitignore
> +++ b/helper/test/.gitignore
> @@ -1,7 +1,7 @@
> *.trs
> *.log
> -odp_chksum
> -odp_process
> -odp_table
> -odp_thread
> -odph_pause
> +chksum
> +process
> +table
> +thread
> +pause
> diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
> index d6820e1..760dac1 100644
> --- a/helper/test/Makefile.am
> +++ b/helper/test/Makefile.am
> @@ -5,11 +5,11 @@ AM_LDFLAGS += -static
>
> TESTS_ENVIRONMENT += TEST_DIR=${builddir}
>
> -EXECUTABLES = odp_chksum$(EXEEXT) \
> - odp_thread$(EXEEXT) \
> - odp_process$(EXEEXT)\
> - odph_pause$(EXEEXT)\
> - odp_table$(EXEEXT)
> +EXECUTABLES = chksum$(EXEEXT) \
> + thread$(EXEEXT) \
> + process$(EXEEXT)\
> + pause$(EXEEXT)\
> + table$(EXEEXT)
>
> COMPILE_ONLY =
>
> @@ -23,11 +23,10 @@ dist_bin_SCRIPTS =
>
> bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY)
>
> -
> -dist_odp_chksum_SOURCES = odp_chksum.c
> -dist_odp_thread_SOURCES = odp_thread.c
> -odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la
> -dist_odp_process_SOURCES = odp_process.c
> -odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la
> -odph_pause_SOURCES = odph_pause.c
> -dist_odp_table_SOURCES = odp_table.c
> +dist_chksum_SOURCES = chksum.c
> +dist_thread_SOURCES = thread.c
> +thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la
> +dist_process_SOURCES = process.c
> +process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la
> +odph_pause_SOURCES = pause.c
> +dist_odp_table_SOURCES = table.c
> diff --git a/helper/test/odp_chksum.c b/helper/test/chksum.c
> similarity index 98%
> rename from helper/test/odp_chksum.c
> rename to helper/test/chksum.c
> index 1d417a8..c987905 100644
> --- a/helper/test/odp_chksum.c
> +++ b/helper/test/chksum.c
> @@ -64,10 +64,9 @@ static int scan_ip(const char *buf, unsigned int *paddr)
> if (paddr)
> *paddr = part1 << 24 | part2 << 16 | part3 << 8 |
> part4;
> return 1;
> - } else {
> - printf("not good ip %d:%d:%d:%d/n", part1, part2, part3,
> part4);
> }
>
> + printf("not good ip %d:%d:%d:%d/n", part1, part2, part3, part4);
> return 0;
> }
>
> diff --git a/helper/test/odph_pause.c b/helper/test/pause.c
> similarity index 100%
> rename from helper/test/odph_pause.c
> rename to helper/test/pause.c
> diff --git a/helper/test/odp_process.c b/helper/test/process.c
> similarity index 96%
> rename from helper/test/odp_process.c
> rename to helper/test/process.c
> index cb9b328..6648627 100644
> --- a/helper/test/odp_process.c
> +++ b/helper/test/process.c
> @@ -53,7 +53,8 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED)
> cpu = odp_cpumask_first(&cpu_mask);
> printf("the first CPU: %i\n", cpu);
>
> - /* reserve cpu 0 for the control plane so remove it from the
> default mask */
> + /* reserve cpu 0 for the control plane so remove it from
> + * the default mask */
> odp_cpumask_clr(&cpu_mask, 0);
> num_workers = odp_cpumask_count(&cpu_mask);
> (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr,
> sizeof(cpumaskstr));
> diff --git a/helper/test/odp_table.c b/helper/test/table.c
> similarity index 99%
> rename from helper/test/odp_table.c
> rename to helper/test/table.c
> index 16de165..b7f53d6 100644
> --- a/helper/test/odp_table.c
> +++ b/helper/test/table.c
> @@ -131,4 +131,3 @@ int main(int argc TEST_UNUSED, char *argv[]
> TEST_UNUSED)
>
> return 0;
> }
> -
> diff --git a/helper/test/odp_thread.c b/helper/test/thread.c
> similarity index 96%
> rename from helper/test/odp_thread.c
> rename to helper/test/thread.c
> index 592f856..4e7f053 100644
> --- a/helper/test/odp_thread.c
> +++ b/helper/test/thread.c
> @@ -54,7 +54,8 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED)
> cpu = odp_cpumask_first(&cpu_mask);
> printf("the first CPU: %i\n", cpu);
>
> - /* reserve cpu 0 for the control plane so remove it from the
> default mask */
> + /* reserve cpu 0 for the control plane so remove it from
> + * the default mask */
> odp_cpumask_clr(&cpu_mask, 0);
> num_workers = odp_cpumask_count(&cpu_mask);
> (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr,
> sizeof(cpumaskstr));
> --
> 1.9.1
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp
>
--
Mike Holmes
Technical Manager - Linaro Networking Group
Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
diff --git a/helper/test/.gitignore b/helper/test/.gitignore index 50a0da4..1984139 100644 --- a/helper/test/.gitignore +++ b/helper/test/.gitignore @@ -1,7 +1,7 @@ *.trs *.log -odp_chksum -odp_process -odp_table -odp_thread -odph_pause +chksum +process +table +thread +pause diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index d6820e1..760dac1 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -5,11 +5,11 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT += TEST_DIR=${builddir} -EXECUTABLES = odp_chksum$(EXEEXT) \ - odp_thread$(EXEEXT) \ - odp_process$(EXEEXT)\ - odph_pause$(EXEEXT)\ - odp_table$(EXEEXT) +EXECUTABLES = chksum$(EXEEXT) \ + thread$(EXEEXT) \ + process$(EXEEXT)\ + pause$(EXEEXT)\ + table$(EXEEXT) COMPILE_ONLY = @@ -23,11 +23,10 @@ dist_bin_SCRIPTS = bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) - -dist_odp_chksum_SOURCES = odp_chksum.c -dist_odp_thread_SOURCES = odp_thread.c -odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la -dist_odp_process_SOURCES = odp_process.c -odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la -odph_pause_SOURCES = odph_pause.c -dist_odp_table_SOURCES = odp_table.c +dist_chksum_SOURCES = chksum.c +dist_thread_SOURCES = thread.c +thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la +dist_process_SOURCES = process.c +process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la +odph_pause_SOURCES = pause.c +dist_odp_table_SOURCES = table.c diff --git a/helper/test/odp_chksum.c b/helper/test/chksum.c similarity index 98% rename from helper/test/odp_chksum.c rename to helper/test/chksum.c index 1d417a8..c987905 100644 --- a/helper/test/odp_chksum.c +++ b/helper/test/chksum.c @@ -64,10 +64,9 @@ static int scan_ip(const char *buf, unsigned int *paddr) if (paddr) *paddr = part1 << 24 | part2 << 16 | part3 << 8 | part4; return 1; - } else { - printf("not good ip %d:%d:%d:%d/n", part1, part2, part3, part4); } + printf("not good ip %d:%d:%d:%d/n", part1, part2, part3, part4); return 0; } diff --git a/helper/test/odph_pause.c b/helper/test/pause.c similarity index 100% rename from helper/test/odph_pause.c rename to helper/test/pause.c diff --git a/helper/test/odp_process.c b/helper/test/process.c similarity index 96% rename from helper/test/odp_process.c rename to helper/test/process.c index cb9b328..6648627 100644 --- a/helper/test/odp_process.c +++ b/helper/test/process.c @@ -53,7 +53,8 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) cpu = odp_cpumask_first(&cpu_mask); printf("the first CPU: %i\n", cpu); - /* reserve cpu 0 for the control plane so remove it from the default mask */ + /* reserve cpu 0 for the control plane so remove it from + * the default mask */ odp_cpumask_clr(&cpu_mask, 0); num_workers = odp_cpumask_count(&cpu_mask); (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr, sizeof(cpumaskstr)); diff --git a/helper/test/odp_table.c b/helper/test/table.c similarity index 99% rename from helper/test/odp_table.c rename to helper/test/table.c index 16de165..b7f53d6 100644 --- a/helper/test/odp_table.c +++ b/helper/test/table.c @@ -131,4 +131,3 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) return 0; } - diff --git a/helper/test/odp_thread.c b/helper/test/thread.c similarity index 96% rename from helper/test/odp_thread.c rename to helper/test/thread.c index 592f856..4e7f053 100644 --- a/helper/test/odp_thread.c +++ b/helper/test/thread.c @@ -54,7 +54,8 @@ int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) cpu = odp_cpumask_first(&cpu_mask); printf("the first CPU: %i\n", cpu); - /* reserve cpu 0 for the control plane so remove it from the default mask */ + /* reserve cpu 0 for the control plane so remove it from + * the default mask */ odp_cpumask_clr(&cpu_mask, 0); num_workers = odp_cpumask_count(&cpu_mask); (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr, sizeof(cpumaskstr));
Prefixed were removed for validation test suite and to be consistent we need to do the same for helpers. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- helper/test/.gitignore | 10 +++++----- helper/test/Makefile.am | 25 ++++++++++++------------- helper/test/{odp_chksum.c => chksum.c} | 3 +-- helper/test/{odph_pause.c => pause.c} | 0 helper/test/{odp_process.c => process.c} | 3 ++- helper/test/{odp_table.c => table.c} | 1 - helper/test/{odp_thread.c => thread.c} | 3 ++- 7 files changed, 22 insertions(+), 23 deletions(-) rename helper/test/{odp_chksum.c => chksum.c} (98%) rename helper/test/{odph_pause.c => pause.c} (100%) rename helper/test/{odp_process.c => process.c} (96%) rename helper/test/{odp_table.c => table.c} (99%) rename helper/test/{odp_thread.c => thread.c} (96%)