| Message ID | 1421174962-23001-2-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Jan 13, 2015 at 8:49 PM, Mike Holmes <mike.holmes@linaro.org> wrote: > Allow the test/performance directory to be optionally included when make > check is run > > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> Reviewed-by: Ciprian Barbu <ciprian.barbu@linaro.org> > --- > > Note that this cleans up the selection on what is to be run. On systems that > do not have CUnit in the path an additional argument is now needed. > This however makes uniform the support for running tests on executables in > the example directories and possible platform implementation specific tests all > in the same framework. > > --enable-test-vald > Requires CUnit support, if that is not in the path it can be pointed to via > --with-cunit-path if required > > --enable-test-perf > Can be selected wihtout any cunit support > > > configure.ac | 37 ++++++++++++++++++++++++++++++++----- > test/performance/.gitignore | 2 ++ > test/performance/Makefile.am | 5 +++++ > test/validation/Makefile.am | 6 +++++- > 4 files changed, 44 insertions(+), 6 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 440cc63..c9464ca 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -60,21 +60,47 @@ AC_SUBST(SDK_INSTALL_PATH) > > AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) > > +########################################################################## > +# Enable/disable Unit tests > +########################################################################## > +cunit_support=no > +AC_ARG_ENABLE([cunit_support], > + [ --enable-cunit-support include cunit infrastructure], > + [if test x$enableval = xyes; then > + cunit_support=yes > + fi]) > + > > ########################################################################## > # Enable/disable Unit tests > ########################################################################## > -AC_ARG_ENABLE([cunit], > - [ --enable-cunit Enable/disable cunit], > +test_vald=no > +AC_ARG_ENABLE([test_vald], > + [ --enable-test-vald run test in test/validation], > [if test x$enableval = xyes; then > + test_vald=yes > cunit_support=yes > fi]) > > +AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) > + > +########################################################################## > +# Enable/disable test-perf > +########################################################################## > +test_perf=no > +AC_ARG_ENABLE([test-perf], > + [ --enable-test-perf run test in test/performance], > + [if test "x$enableval" = "xyes"; then > + test_perf=yes > + fi]) > + > +AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) > + > ########################################################################## > # Set optional CUnit path > ########################################################################## > AC_ARG_WITH([cunit-path], > -AC_HELP_STRING([--with-cunit-path=DIR Path to Cunit libs and headers], > +AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], > [(or in the default path if not specified).]), > [CUNIT_PATH=$withval > AM_CPPFLAGS="$AM_CPPFLAGS -I$CUNIT_PATH/include" > @@ -157,7 +183,7 @@ else > cunit_support=no > fi > > -AM_CONDITIONAL([ODP_CUNIT_ENABLED], [test x$cunit_support = xyes ]) > +AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) > > ########################################################################## > # Check for OpenSSL availability > @@ -226,7 +252,6 @@ AC_SUBST([LDFLAGS]) > AC_OUTPUT > AC_MSG_RESULT([ > $PACKAGE $VERSION > - ======== > > with_platform: ${with_platform} > prefix: ${prefix} > @@ -243,4 +268,6 @@ AC_MSG_RESULT([ > am_ldflags: ${AM_LDFLAGS} > libs: ${LIBS} > cunit: ${cunit_support} > + test_vald: ${test_vald} > + test_perf: ${test_perf} > ]) > diff --git a/test/performance/.gitignore b/test/performance/.gitignore > index a229e10..9ccb102 100644 > --- a/test/performance/.gitignore > +++ b/test/performance/.gitignore > @@ -1 +1,3 @@ > +*.log > +*.trs > odp_scheduling > diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am > index 359c4f0..8b2e0e2 100644 > --- a/test/performance/Makefile.am > +++ b/test/performance/Makefile.am > @@ -1,5 +1,10 @@ > include $(top_srcdir)/test/Makefile.inc > > +if test_perf > +TESTS = odp_scheduling > +check_PROGRAMS = ${bin_PROGRAMS} > +endif > + > bin_PROGRAMS = odp_scheduling > odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static > odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test > diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am > index c03294c..8e03392 100644 > --- a/test/validation/Makefile.am > +++ b/test/validation/Makefile.am > @@ -5,10 +5,14 @@ AM_LDFLAGS += -static > > TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} > > -if ODP_CUNIT_ENABLED > +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 > check_PROGRAMS = ${bin_PROGRAMS} > bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time > +endif > + > +if cunit_support > +bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system > odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto > odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer > endif > -- > 2.1.0 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/configure.ac b/configure.ac index 440cc63..c9464ca 100644 --- a/configure.ac +++ b/configure.ac @@ -60,21 +60,47 @@ AC_SUBST(SDK_INSTALL_PATH) AM_CONDITIONAL([SDK_INSTALL_PATH_], [test "x${SDK_INSTALL_PATH_}" = "x1"]) +########################################################################## +# Enable/disable Unit tests +########################################################################## +cunit_support=no +AC_ARG_ENABLE([cunit_support], + [ --enable-cunit-support include cunit infrastructure], + [if test x$enableval = xyes; then + cunit_support=yes + fi]) + ########################################################################## # Enable/disable Unit tests ########################################################################## -AC_ARG_ENABLE([cunit], - [ --enable-cunit Enable/disable cunit], +test_vald=no +AC_ARG_ENABLE([test_vald], + [ --enable-test-vald run test in test/validation], [if test x$enableval = xyes; then + test_vald=yes cunit_support=yes fi]) +AM_CONDITIONAL([test_vald], [test x$test_vald = xyes ]) + +########################################################################## +# Enable/disable test-perf +########################################################################## +test_perf=no +AC_ARG_ENABLE([test-perf], + [ --enable-test-perf run test in test/performance], + [if test "x$enableval" = "xyes"; then + test_perf=yes + fi]) + +AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ]) + ########################################################################## # Set optional CUnit path ########################################################################## AC_ARG_WITH([cunit-path], -AC_HELP_STRING([--with-cunit-path=DIR Path to Cunit libs and headers], +AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], [(or in the default path if not specified).]), [CUNIT_PATH=$withval AM_CPPFLAGS="$AM_CPPFLAGS -I$CUNIT_PATH/include" @@ -157,7 +183,7 @@ else cunit_support=no fi -AM_CONDITIONAL([ODP_CUNIT_ENABLED], [test x$cunit_support = xyes ]) +AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ]) ########################################################################## # Check for OpenSSL availability @@ -226,7 +252,6 @@ AC_SUBST([LDFLAGS]) AC_OUTPUT AC_MSG_RESULT([ $PACKAGE $VERSION - ======== with_platform: ${with_platform} prefix: ${prefix} @@ -243,4 +268,6 @@ AC_MSG_RESULT([ am_ldflags: ${AM_LDFLAGS} libs: ${LIBS} cunit: ${cunit_support} + test_vald: ${test_vald} + test_perf: ${test_perf} ]) diff --git a/test/performance/.gitignore b/test/performance/.gitignore index a229e10..9ccb102 100644 --- a/test/performance/.gitignore +++ b/test/performance/.gitignore @@ -1 +1,3 @@ +*.log +*.trs odp_scheduling diff --git a/test/performance/Makefile.am b/test/performance/Makefile.am index 359c4f0..8b2e0e2 100644 --- a/test/performance/Makefile.am +++ b/test/performance/Makefile.am @@ -1,5 +1,10 @@ include $(top_srcdir)/test/Makefile.inc +if test_perf +TESTS = odp_scheduling +check_PROGRAMS = ${bin_PROGRAMS} +endif + bin_PROGRAMS = odp_scheduling odp_scheduling_LDFLAGS = $(AM_LDFLAGS) -static odp_scheduling_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/test diff --git a/test/validation/Makefile.am b/test/validation/Makefile.am index c03294c..8e03392 100644 --- a/test/validation/Makefile.am +++ b/test/validation/Makefile.am @@ -5,10 +5,14 @@ AM_LDFLAGS += -static TESTS_ENVIRONMENT = ODP_PLATFORM=${with_platform} -if ODP_CUNIT_ENABLED +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 check_PROGRAMS = ${bin_PROGRAMS} bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_timer odp_time +endif + +if cunit_support +bin_PROGRAMS = odp_init odp_queue odp_crypto odp_shm odp_schedule odp_pktio odp_buffer odp_system odp_crypto_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/crypto odp_buffer_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/buffer endif
Allow the test/performance directory to be optionally included when make check is run Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- Note that this cleans up the selection on what is to be run. On systems that do not have CUnit in the path an additional argument is now needed. This however makes uniform the support for running tests on executables in the example directories and possible platform implementation specific tests all in the same framework. --enable-test-vald Requires CUnit support, if that is not in the path it can be pointed to via --with-cunit-path if required --enable-test-perf Can be selected wihtout any cunit support configure.ac | 37 ++++++++++++++++++++++++++++++++----- test/performance/.gitignore | 2 ++ test/performance/Makefile.am | 5 +++++ test/validation/Makefile.am | 6 +++++- 4 files changed, 44 insertions(+), 6 deletions(-)