| Message ID | 1422888341-6303-1-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 2 February 2015 at 09:45, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > 1. Reorder programs in Makefile.am to be in alphabetical order. > 2. Put common source to variable. > 3. Put source names on separate line to have less merge conflicts. > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > Reviewed-by: Mike Holmes <mike.holmes@linaro.org> > --- > v5: tabs to spaces in odp_queue and odp_synchronizers line. > > test/validation/Makefile.am | 60 > +++++++++++++++++++++++++++++---------------- > 1 file changed, 39 insertions(+), 21 deletions(-) > > diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am > index 2942b85..acc5b83 100644 > --- a/test/validation/Makefile.am > +++ b/test/validation/Makefile.am > @@ -5,33 +5,51 @@ AM_LDFLAGS += -static > > TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} > > +EXECUTABLES = odp_buffer \ > + odp_classification \ > + odp_crypto \ > + odp_init \ > + odp_queue \ > + odp_schedule \ > + odp_shm \ > + odp_system \ > + odp_synchronizers \ > + odp_time \ > + odp_timer > + > +COMPILE_ONLY = odp_pktio > + > +TESTSCRIPTS = odp_pktio_run > + > if test_vald > -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run > odp_buffer odp_system odp_timer odp_time odp_synchronizers > odp_classification > +TESTS = $(EXECUTABLES) $(TESTSCRIPTS) > +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) > endif > > -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule > odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers > odp_classification > -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto > -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer > -odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification > +check_PROGRAMS = ${bin_PROGRAMS} > > -dist_odp_init_SOURCES = odp_init.c > -dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c > -dist_odp_queue_SOURCES = odp_queue.c common/odp_cunit_common.c > -dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ > - crypto/odp_crypto_test_sync_inp.c \ > - crypto/odp_crypto_test_rng.c \ > - odp_crypto.c common/odp_cunit_common.c > -dist_odp_shm_SOURCES = odp_shm.c common/odp_cunit_common.c > -dist_odp_schedule_SOURCES = odp_schedule.c common/odp_cunit_common.c > +ODP_CU_COMMON=common/odp_cunit_common.c > + > +odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer > dist_odp_buffer_SOURCES = buffer/odp_buffer_pool_test.c \ > buffer/odp_buffer_test.c \ > buffer/odp_packet_test.c \ > - odp_buffer.c common/odp_cunit_common.c > -dist_odp_system_SOURCES = odp_system.c common/odp_cunit_common.c > -dist_odp_timer_SOURCES = odp_timer.c common/odp_cunit_common.c > -dist_odp_time_SOURCES = odp_time.c common/odp_cunit_common.c > -dist_odp_synchronizers_SOURCES = odp_synchronizers.c \ > - common/odp_cunit_common.c > + odp_buffer.c $(ODP_CU_COMMON) > +odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification > dist_odp_classification_SOURCES = > classification/odp_classification_tests.c \ > classification/odp_classification_basic.c \ > - odp_classification.c > common/odp_cunit_common.c > + odp_classification.c $(ODP_CU_COMMON) > +odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto > +dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ > + crypto/odp_crypto_test_sync_inp.c \ > + crypto/odp_crypto_test_rng.c \ > + odp_crypto.c $(ODP_CU_COMMON) > +dist_odp_init_SOURCES = odp_init.c > +dist_odp_queue_SOURCES = odp_queue.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_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) > -- > 1.8.5.1.163.gd7aced9 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
On 2015-02-02 09:51, Mike Holmes wrote: > On 2 February 2015 at 09:45, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > > > 1. Reorder programs in Makefile.am to be in alphabetical order. > > 2. Put common source to variable. > > 3. Put source names on separate line to have less merge conflicts. > > > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > > > > Reviewed-by: Mike Holmes <mike.holmes@linaro.org> > > > > --- > > v5: tabs to spaces in odp_queue and odp_synchronizers line. > > > > test/validation/Makefile.am | 60 > > +++++++++++++++++++++++++++++---------------- > > 1 file changed, 39 insertions(+), 21 deletions(-) > > > > diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am > > index 2942b85..acc5b83 100644 > > --- a/test/validation/Makefile.am > > +++ b/test/validation/Makefile.am > > @@ -5,33 +5,51 @@ AM_LDFLAGS += -static > > > > TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} > > > > +EXECUTABLES = odp_buffer \ > > + odp_classification \ > > + odp_crypto \ > > + odp_init \ > > + odp_queue \ > > + odp_schedule \ > > + odp_shm \ > > + odp_system \ > > + odp_synchronizers \ > > + odp_time \ > > + odp_timer > > + > > +COMPILE_ONLY = odp_pktio > > + > > +TESTSCRIPTS = odp_pktio_run > > + > > if test_vald > > -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run > > odp_buffer odp_system odp_timer odp_time odp_synchronizers > > odp_classification > > +TESTS = $(EXECUTABLES) $(TESTSCRIPTS) > > +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) > > endif > > > > -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule > > odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers > > odp_classification > > -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto > > -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer > > -odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification > > +check_PROGRAMS = ${bin_PROGRAMS} Commit 30b60c59ccf88fc04401c772862ca4770cd6d900 removed this, any reason why we add it again? Cheers, Anders
On 02/02/15 18:05, Anders Roxell wrote: > On 2015-02-02 09:51, Mike Holmes wrote: >> On 2 February 2015 at 09:45, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: >> >>> 1. Reorder programs in Makefile.am to be in alphabetical order. >>> 2. Put common source to variable. >>> 3. Put source names on separate line to have less merge conflicts. >>> >>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> >>> >> Reviewed-by: Mike Holmes <mike.holmes@linaro.org> >> >> >>> --- >>> v5: tabs to spaces in odp_queue and odp_synchronizers line. >>> >>> test/validation/Makefile.am | 60 >>> +++++++++++++++++++++++++++++---------------- >>> 1 file changed, 39 insertions(+), 21 deletions(-) >>> >>> diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am >>> index 2942b85..acc5b83 100644 >>> --- a/test/validation/Makefile.am >>> +++ b/test/validation/Makefile.am >>> @@ -5,33 +5,51 @@ AM_LDFLAGS += -static >>> >>> TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} >>> >>> +EXECUTABLES = odp_buffer \ >>> + odp_classification \ >>> + odp_crypto \ >>> + odp_init \ >>> + odp_queue \ >>> + odp_schedule \ >>> + odp_shm \ >>> + odp_system \ >>> + odp_synchronizers \ >>> + odp_time \ >>> + odp_timer >>> + >>> +COMPILE_ONLY = odp_pktio >>> + >>> +TESTSCRIPTS = odp_pktio_run >>> + >>> if test_vald >>> -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run >>> odp_buffer odp_system odp_timer odp_time odp_synchronizers >>> odp_classification >>> +TESTS = $(EXECUTABLES) $(TESTSCRIPTS) >>> +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) >>> endif >>> >>> -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule >>> odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers >>> odp_classification >>> -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto >>> -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer >>> -odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification >>> +check_PROGRAMS = ${bin_PROGRAMS} > Commit 30b60c59ccf88fc04401c772862ca4770cd6d900 removed this, any reason > why we add it again? > > Cheers, > Anders Thanks, looks like I wrongly merged previous version of patch. Will update. Maxim.
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index 2942b85..acc5b83 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,33 +5,51 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} +EXECUTABLES = odp_buffer \ + odp_classification \ + odp_crypto \ + odp_init \ + odp_queue \ + odp_schedule \ + odp_shm \ + odp_system \ + odp_synchronizers \ + odp_time \ + odp_timer + +COMPILE_ONLY = odp_pktio + +TESTSCRIPTS = odp_pktio_run + if test_vald -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system odp_timer odp_time odp_synchronizers odp_classification +TESTS = $(EXECUTABLES) $(TESTSCRIPTS) +bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) endif -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time odp_synchronizers odp_classification -odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto -odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer -odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification +check_PROGRAMS = ${bin_PROGRAMS} -dist_odp_init_SOURCES = odp_init.c -dist_odp_pktio_SOURCES = odp_pktio.c common/odp_cunit_common.c -dist_odp_queue_SOURCES = odp_queue.c common/odp_cunit_common.c -dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ - crypto/odp_crypto_test_sync_inp.c \ - crypto/odp_crypto_test_rng.c \ - odp_crypto.c common/odp_cunit_common.c -dist_odp_shm_SOURCES = odp_shm.c common/odp_cunit_common.c -dist_odp_schedule_SOURCES = odp_schedule.c common/odp_cunit_common.c +ODP_CU_COMMON=common/odp_cunit_common.c + +odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer dist_odp_buffer_SOURCES = buffer/odp_buffer_pool_test.c \ buffer/odp_buffer_test.c \ buffer/odp_packet_test.c \ - odp_buffer.c common/odp_cunit_common.c -dist_odp_system_SOURCES = odp_system.c common/odp_cunit_common.c -dist_odp_timer_SOURCES = odp_timer.c common/odp_cunit_common.c -dist_odp_time_SOURCES = odp_time.c common/odp_cunit_common.c -dist_odp_synchronizers_SOURCES = odp_synchronizers.c \ - common/odp_cunit_common.c + odp_buffer.c $(ODP_CU_COMMON) +odp_classification_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/classification dist_odp_classification_SOURCES = classification/odp_classification_tests.c \ classification/odp_classification_basic.c \ - odp_classification.c common/odp_cunit_common.c + odp_classification.c $(ODP_CU_COMMON) +odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto +dist_odp_crypto_SOURCES = crypto/odp_crypto_test_async_inp.c \ + crypto/odp_crypto_test_sync_inp.c \ + crypto/odp_crypto_test_rng.c \ + odp_crypto.c $(ODP_CU_COMMON) +dist_odp_init_SOURCES = odp_init.c +dist_odp_queue_SOURCES = odp_queue.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_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)
1. Reorder programs in Makefile.am to be in alphabetical order. 2. Put common source to variable. 3. Put source names on separate line to have less merge conflicts. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- v5: tabs to spaces in odp_queue and odp_synchronizers line. test/validation/Makefile.am | 60 +++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 21 deletions(-)