On 2 June 2015 at 11:31, Stuart Haslam <[email protected]> wrote:
> On Thu, May 28, 2015 at 12:58:10PM +0200, Christophe Milard wrote: > > Module pktio now gets its own directory and create its own lib > > (currentely only containing its executable) > > Startup scripting stuff is just moved to the pktio directory but remains > untouched > > checkpatch complains about this line being > 75 characters. > will be fixed in v2 > > > at this stage (test is still ran from validation side) > > > > Signed-off-by: Christophe Milard <[email protected]> > > --- > > configure.ac | 1 + > > test/validation/.gitignore | 1 - > > test/validation/Makefile.am | 13 ++++--------- > > test/validation/Makefile.inc | 7 +++++++ > > test/validation/pktio/.gitignore | 4 ++++ > > test/validation/pktio/Makefile.am | 10 ++++++++++ > > test/validation/{odp_pktio.c => pktio/pktio.c} | 9 ++------- > > test/validation/pktio/pktio.h | 7 +++++++ > > test/validation/pktio/pktio_main.c | 12 ++++++++++++ > > test/validation/{odp_pktio_run => pktio/pktio_run} | 16 ++++++++-------- > > 10 files changed, 55 insertions(+), 25 deletions(-) > > create mode 100644 test/validation/Makefile.inc > > create mode 100644 test/validation/pktio/.gitignore > > create mode 100644 test/validation/pktio/Makefile.am > > rename test/validation/{odp_pktio.c => pktio/pktio.c} (99%) > > create mode 100644 test/validation/pktio/pktio.h > > create mode 100644 test/validation/pktio/pktio_main.c > > rename test/validation/{odp_pktio_run => pktio/pktio_run} (85%) > > > > diff --git a/configure.ac b/configure.ac > > index f8a7e72..95eceae 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -301,6 +301,7 @@ AC_CONFIG_FILES([Makefile > > test/performance/Makefile > > test/validation/Makefile > > test/validation/common/Makefile > > + test/validation/pktio/Makefile > > test/miscellaneous/Makefile > > ]) > > > > diff --git a/test/validation/.gitignore b/test/validation/.gitignore > > index 34ea143..7d3a0fc 100644 > > --- a/test/validation/.gitignore > > +++ b/test/validation/.gitignore > > @@ -9,7 +9,6 @@ odp_init > > odp_init_abort > > odp_init_log > > odp_packet > > -odp_pktio > > odp_pool > > odp_queue > > odp_random > > diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am > > index 8299e01..a82e35c 100644 > > --- a/test/validation/Makefile.am > > +++ b/test/validation/Makefile.am > > @@ -25,16 +25,12 @@ EXECUTABLES = odp_buffer \ > > odp_thread \ > > odp_ver_abt_log_dbg > > > > -COMPILE_ONLY = odp_pktio > > - > > -TESTSCRIPTS = odp_pktio_run > > +TESTSCRIPTS = pktio/pktio_run > > > > if test_vald > > TESTS = $(EXECUTABLES) $(TESTSCRIPTS) > > endif > > > > -dist_bin_SCRIPTS = odp_pktio_run > > - > > bin_PROGRAMS = $(EXECUTABLES) $(COMPILE_ONLY) > > > > ODP_CU_COMMON=common/odp_cunit_common.c > > @@ -58,9 +54,6 @@ dist_odp_shared_memory_SOURCES = > odp_shared_memory.c > > dist_odp_synchronizers_SOURCES = odp_synchronizers.c > > dist_odp_time_SOURCES = odp_time.c > > dist_odp_timer_SOURCES = odp_timer.c > > -odp_pktio_LDADD = > $(top_builddir)/test/validation/common/libcunit_common.a \ > > - $(LIB)/libodp.la > > -dist_odp_pktio_SOURCES = odp_pktio.c > > dist_odp_packet_SOURCES = odp_packet.c > > dist_odp_pool_SOURCES = odp_pool.c > > dist_odp_cpumask_SOURCES = odp_cpumask.c > > @@ -69,4 +62,6 @@ odp_ver_abt_log_dbg_CFLAGS = $(AM_CFLAGS) > -I$(srcdir)/ver_abt_log_dbg > > dist_odp_ver_abt_log_dbg_SOURCES = ver_abt_log_dbg/odp_system.c \ > > ver_abt_log_dbg/odp_errno.c \ > > > ver_abt_log_dbg/odp_ver_abt_log_dbg.c > > -SUBDIRS = common > > + > > +ODP_MODULES = pktio > > +SUBDIRS = common $(ODP_MODULES) > > diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc > > new file mode 100644 > > index 0000000..3cdc6a7 > > --- /dev/null > > +++ b/test/validation/Makefile.inc > > @@ -0,0 +1,7 @@ > > +include $(top_srcdir)/test/Makefile.inc > > + > > +AM_CFLAGS += -I$(top_srcdir)/test/validation/common > > +AM_LDFLAGS += -static > > + > > +LIBCUNIT_COMMON = > $(top_builddir)/test/validation/common/libcunit_common.a > > +LIBODP = $(LIB)/libodp.la > > diff --git a/test/validation/pktio/.gitignore > b/test/validation/pktio/.gitignore > > new file mode 100644 > > index 0000000..7aa8e13 > > --- /dev/null > > +++ b/test/validation/pktio/.gitignore > > @@ -0,0 +1,4 @@ > > +*.log > > +*.trs > > These aren't needed here as they're listed in test/validation/.gitignore > Ok. will be removed in v2 > > > +libpktio.a > > +pktio_main > > diff --git a/test/validation/pktio/Makefile.am > b/test/validation/pktio/Makefile.am > > new file mode 100644 > > index 0000000..2acb63b > > --- /dev/null > > +++ b/test/validation/pktio/Makefile.am > > @@ -0,0 +1,10 @@ > > +include ../Makefile.inc > > + > > +dist_bin_SCRIPTS = pktio_run > > + > > +noinst_LIBRARIES = libpktio.a > > +libpktio_a_SOURCES = pktio.c > > + > > +check_PROGRAMS = pktio_main > > +dist_pktio_main_SOURCES = pktio_main.c > > +pktio_main_LDADD = libpktio.a $(LIBCUNIT_COMMON) $(LIBODP) > > As Maxim has pointed out, pktio_main isn't installed by "make install". > will be back to bin_PROGRAMS in v2. Although I really wonder if this is right ( gathering platform agnostic tests with platform dependents test with all for of possible binaries...). Should tests really be delivered as normal binaries... I though that the autotools check_PROGRAMS was just there for that reasons: checking the delivery (the delivery being ODP, not tests - at least as I see it). But we can take that later. Christophe > -- > Stuart. >
_______________________________________________ lng-odp mailing list [email protected] https://lists.linaro.org/mailman/listinfo/lng-odp
