| Message ID | 1419594246-10255-1-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | Accepted |
| Commit | 73337df8018f1a81a9b7a732eb996dadc8a1e819 |
| Headers | show |
On 26 December 2014 at 06:44, 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> --- > test/validation/Makefile.am | 36 +++++++++++++++++++++++------------- > 1 file changed, 23 insertions(+), 13 deletions(-) > > diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am > index c0545b7..8b87468 100644 > --- a/test/validation/Makefile.am > +++ b/test/validation/Makefile.am > @@ -5,25 +5,35 @@ AM_LDFLAGS += -static > > TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} > > +BINS = odp_buffer \ > + odp_crypto \ > + odp_init \ > + odp_queue \ > + odp_schedule \ > + odp_shm \ > + odp_system > + > if ODP_CUNIT_ENABLED > -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run > odp_buffer odp_system > +TESTS = $(BINS) odp_pktio_run > I think we need comment to explain why odp_pktio_run is listed separately from bin - maybe have a list called BIN_SCRIPTS ? > check_PROGRAMS = ${bin_PROGRAMS} > -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule > odp_pktio odp_buffer odp_system > +bin_PROGRAMS = $(BINS) odp_pktio > odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto > odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer > endif > > -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 > + > 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 > + odp_buffer.c $(ODP_CU_COMMON) > +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_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON) > +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) > -- > 1.8.5.1.163.gd7aced9 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
On 12/26/2014 03:32 PM, Mike Holmes wrote: > > > On 26 December 2014 at 06:44, Maxim Uvarov <maxim.uvarov@linaro.org > <mailto: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 > <mailto:maxim.uvarov@linaro.org>> > > --- > test/validation/Makefile.am | 36 +++++++++++++++++++++++------------- > 1 file changed, 23 insertions(+), 13 deletions(-) > > diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am > index c0545b7..8b87468 100644 > --- a/test/validation/Makefile.am > +++ b/test/validation/Makefile.am > @@ -5,25 +5,35 @@ AM_LDFLAGS += -static > > TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} > > +BINS = odp_buffer \ > + odp_crypto \ > + odp_init \ > + odp_queue \ > + odp_schedule \ > + odp_shm \ > + odp_system > + > if ODP_CUNIT_ENABLED > -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule > odp_pktio_run odp_buffer odp_system > +TESTS = $(BINS) odp_pktio_run > > > I think we need comment to explain why odp_pktio_run is listed > separately from bin - maybe have a list called BIN_SCRIPTS ? We can add everything to TESTS, then remove _run. With like that: z="odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system" echo ${z[@]//_run*/} But I think makefile does not accept that. Or syntax should be changed. Maxim. > check_PROGRAMS = ${bin_PROGRAMS} > -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule > odp_pktio odp_buffer odp_system > +bin_PROGRAMS = $(BINS) odp_pktio > odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto > odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer > endif > > -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 > + > 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 > + odp_buffer.c $(ODP_CU_COMMON) > +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_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON) > +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) > -- > 1.8.5.1.163.gd7aced9 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > -- > *Mike Holmes* > Linaro Sr Technical Manager > LNG - ODP
diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index c0545b7..8b87468 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,25 +5,35 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} +BINS = odp_buffer \ + odp_crypto \ + odp_init \ + odp_queue \ + odp_schedule \ + odp_shm \ + odp_system + if ODP_CUNIT_ENABLED -TESTS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio_run odp_buffer odp_system +TESTS = $(BINS) odp_pktio_run check_PROGRAMS = ${bin_PROGRAMS} -bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system +bin_PROGRAMS = $(BINS) odp_pktio odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer endif -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 + 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 + odp_buffer.c $(ODP_CU_COMMON) +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_pktio_SOURCES = odp_pktio.c $(ODP_CU_COMMON) +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)
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> --- test/validation/Makefile.am | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-)