diff mbox

[v4] test: miscellaneous: Add CPP test

Message ID 1424901857-27384-1-git-send-email-mike.holmes@linaro.org
State Accepted
Commit 25270ef02b18b55e26a1401b7c551c244669fa11
Headers show

Commit Message

Mike Holmes Feb. 25, 2015, 10:04 p.m. UTC 
From: Simon Kagstrom <simon.kagstrom@netinsight.net>

Add conditional test to link and run ODP from a cpp application.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
v4
Disable by default, use --enable-test-cpp to see C++ test and the
warnings it generates.

 configure.ac                            | 20 ++++++++++++++++++++
 test/Makefile.am                        |  2 +-
 test/Makefile.inc                       |  5 +++--
 test/miscellaneous/.gitignore           |  1 +
 test/miscellaneous/Makefile.am          | 12 ++++++++++++
 test/miscellaneous/gitignore            |  1 +
 test/miscellaneous/odp_api_from_cpp.cpp | 12 ++++++++++++
 7 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 test/miscellaneous/.gitignore
 create mode 100644 test/miscellaneous/Makefile.am
 create mode 100644 test/miscellaneous/gitignore
 create mode 100644 test/miscellaneous/odp_api_from_cpp.cpp

Comments

Bill Fischofer Feb. 25, 2015, 10:18 p.m. UTC | #1 
apply-and-build for this gives the following error:

Using patch: 0001-test-miscellaneous-Add-CPP-test.patch
  Trying to apply patch
  Patch applied
WARNING: Do not use whitespace before Cc:
#76: FILE: configure.ac:294:
  cc: ${CC}

WARNING: Use a single space after Cc:
#76: FILE: configure.ac:294:
  cc: ${CC}

ERROR: Unrecognized email address: '${CC}'
#76: FILE: configure.ac:294:
  cc: ${CC}

total: 1 errors, 2 warnings, 0 checks, 100 lines checked

NOTE: Ignored message types: DEPRECATED_VARIABLE NEW_TYPEDEFS

/home/bill/linaro/cpptest/0001-test-miscellaneous-Add-CPP-test.patch has
style problems, please review.


On Wed, Feb 25, 2015 at 4:04 PM, Mike Holmes <mike.holmes@linaro.org> wrote:

> From: Simon Kagstrom <simon.kagstrom@netinsight.net>
>
> Add conditional test to link and run ODP from a cpp application.
>
> Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
> ---
> v4
> Disable by default, use --enable-test-cpp to see C++ test and the
> warnings it generates.
>
>  configure.ac                            | 20 ++++++++++++++++++++
>  test/Makefile.am                        |  2 +-
>  test/Makefile.inc                       |  5 +++--
>  test/miscellaneous/.gitignore           |  1 +
>  test/miscellaneous/Makefile.am          | 12 ++++++++++++
>  test/miscellaneous/gitignore            |  1 +
>  test/miscellaneous/odp_api_from_cpp.cpp | 12 ++++++++++++
>  7 files changed, 50 insertions(+), 3 deletions(-)
>  create mode 100644 test/miscellaneous/.gitignore
>  create mode 100644 test/miscellaneous/Makefile.am
>  create mode 100644 test/miscellaneous/gitignore
>  create mode 100644 test/miscellaneous/odp_api_from_cpp.cpp
>
> diff --git a/configure.ac b/configure.ac
> index e5c1c56..7d45ece 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -13,6 +13,8 @@ AM_SILENT_RULES([yes])
>  AC_PROG_CC
>  AM_PROG_CC_C_O
>
> +AC_PROG_CXX
> +
>  AC_PROG_INSTALL
>  AC_PROG_MAKE_SET
>
> @@ -114,6 +116,20 @@ AC_ARG_ENABLE([test-perf],
>  AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ])
>
>  ##########################################################################
> +# Enable/disable test-cpp
> +##########################################################################
> +test_cpp=no
> +AC_ARG_ENABLE([test-cpp],
> +    [  --enable-test-cpp       run basic test aginast cpp],
> +    [if test "x$enableval" = "xyes"; then
> +        test_cpp=yes
> +     else
> +        test_cpp=no
> +    fi])
> +
> +AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
> +
> +##########################################################################
>  # Set optional CUnit path
>  ##########################################################################
>  AC_ARG_WITH([cunit-path],
> @@ -228,6 +244,7 @@ ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef
> -Wwrite-strings"
>  # Default include setup
>  ##########################################################################
>  AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS"
> +AM_CXXFLAGS="-std=c++11"
>
>  AC_CONFIG_FILES([Makefile
>                  doc/Makefile
> @@ -244,6 +261,7 @@ AC_CONFIG_FILES([Makefile
>                  test/api_test/Makefile
>                  test/performance/Makefile
>                  test/validation/Makefile
> +                test/miscellaneous/Makefile
>                  ])
>
>  AC_SEARCH_LIBS([timer_create],[rt posix4])
> @@ -276,6 +294,7 @@ AC_MSG_RESULT([
>         cc:                     ${CC}
>         cppflags:               ${CPPFLAGS}
>         am_cppflags:            ${AM_CPPFLAGS}
> +       am_cxxflags:            ${AM_CXXFLAGS}
>         cflags:                 ${CFLAGS}
>         am_cflags:              ${AM_CFLAGS}
>         ldflags:                ${LDFLAGS}
> @@ -284,4 +303,5 @@ AC_MSG_RESULT([
>         cunit:                  ${cunit_support}
>         test_vald:              ${test_vald}
>         test_perf:              ${test_perf}
> +       test_cpp:               ${test_cpp}
>  ])
> diff --git a/test/Makefile.am b/test/Makefile.am
> index ec2b248..2ba8008 100644
> --- a/test/Makefile.am
> +++ b/test/Makefile.am
> @@ -1,4 +1,4 @@
> -SUBDIRS = api_test performance
> +SUBDIRS = api_test performance miscellaneous
>
>  if cunit_support
>      SUBDIRS += validation
> diff --git a/test/Makefile.inc b/test/Makefile.inc
> index ebee80a..93ead25 100644
> --- a/test/Makefile.inc
> +++ b/test/Makefile.inc
> @@ -2,12 +2,13 @@ include $(top_srcdir)/Makefile.inc
>  include $(top_srcdir)/platform/@with_platform@/Makefile.inc
>  LIB   = $(top_builddir)/lib
>  LDADD = $(LIB)/libodp.la
> -AM_CFLAGS += \
> -       -I$(srcdir) \
> +INCFLAGS = -I$(srcdir) \
>         -I$(top_srcdir)/test \
>         -I$(top_srcdir)/platform/@with_platform@/include \
>         -I$(top_srcdir)/platform/linux-generic/include \
>         -I$(top_srcdir)/include \
>         -I$(top_srcdir)/helper/include
> +AM_CFLAGS += $(INCFLAGS)
> +AM_CXXFLAGS = $(INCFLAGS)
>
>  AM_LDFLAGS += -L$(LIB)
> diff --git a/test/miscellaneous/.gitignore b/test/miscellaneous/.gitignore
> new file mode 100644
> index 0000000..134df38
> --- /dev/null
> +++ b/test/miscellaneous/.gitignore
> @@ -0,0 +1 @@
> +odp_api_from_cpp
> diff --git a/test/miscellaneous/Makefile.am
> b/test/miscellaneous/Makefile.am
> new file mode 100644
> index 0000000..863643c
> --- /dev/null
> +++ b/test/miscellaneous/Makefile.am
> @@ -0,0 +1,12 @@
> +include $(top_srcdir)/test/Makefile.inc
> +
> +if test_cpp
> +bin_PROGRAMS =  odp_api_from_cpp
> +TESTS = odp_api_from_cpp
> +endif
> +
> +odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
> +
> +odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static
> +
> +dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp
> diff --git a/test/miscellaneous/gitignore b/test/miscellaneous/gitignore
> new file mode 100644
> index 0000000..134df38
> --- /dev/null
> +++ b/test/miscellaneous/gitignore
> @@ -0,0 +1 @@
> +odp_api_from_cpp
> diff --git a/test/miscellaneous/odp_api_from_cpp.cpp
> b/test/miscellaneous/odp_api_from_cpp.cpp
> new file mode 100644
> index 0000000..e62ef8d
> --- /dev/null
> +++ b/test/miscellaneous/odp_api_from_cpp.cpp
> @@ -0,0 +1,12 @@
> +#include <cstdio>
> +#include <odp.h>
> +#include <odp/helper/linux.h>
> +
> +int main(int argc, const char *argv[])
> +{
> +
> +       printf("\tODP API version: %s\n", odp_version_api_str());
> +       printf("\tODP implementation version: %s\n",
> odp_version_impl_str());
> +
> +       return 0;
> +}
> --
> 2.1.0
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
>
Mike Holmes Feb. 25, 2015, 10:20 p.m. UTC | #2 
As per the previous versions, that is a checkpatch bug, it thinks you want
to CC a mailing list.

On 25 February 2015 at 17:18, Bill Fischofer <bill.fischofer@linaro.org>
wrote:

> apply-and-build for this gives the following error:
>
> Using patch: 0001-test-miscellaneous-Add-CPP-test.patch
>   Trying to apply patch
>   Patch applied
> WARNING: Do not use whitespace before Cc:
> #76: FILE: configure.ac:294:
>   cc: ${CC}
>
> WARNING: Use a single space after Cc:
> #76: FILE: configure.ac:294:
>   cc: ${CC}
>
> ERROR: Unrecognized email address: '${CC}'
> #76: FILE: configure.ac:294:
>   cc: ${CC}
>
> total: 1 errors, 2 warnings, 0 checks, 100 lines checked
>
> NOTE: Ignored message types: DEPRECATED_VARIABLE NEW_TYPEDEFS
>
> /home/bill/linaro/cpptest/0001-test-miscellaneous-Add-CPP-test.patch has
> style problems, please review.
>
>
> On Wed, Feb 25, 2015 at 4:04 PM, Mike Holmes <mike.holmes@linaro.org>
> wrote:
>
>> From: Simon Kagstrom <simon.kagstrom@netinsight.net>
>>
>> Add conditional test to link and run ODP from a cpp application.
>>
>> Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
>> ---
>> v4
>> Disable by default, use --enable-test-cpp to see C++ test and the
>> warnings it generates.
>>
>>  configure.ac                            | 20 ++++++++++++++++++++
>>  test/Makefile.am                        |  2 +-
>>  test/Makefile.inc                       |  5 +++--
>>  test/miscellaneous/.gitignore           |  1 +
>>  test/miscellaneous/Makefile.am          | 12 ++++++++++++
>>  test/miscellaneous/gitignore            |  1 +
>>  test/miscellaneous/odp_api_from_cpp.cpp | 12 ++++++++++++
>>  7 files changed, 50 insertions(+), 3 deletions(-)
>>  create mode 100644 test/miscellaneous/.gitignore
>>  create mode 100644 test/miscellaneous/Makefile.am
>>  create mode 100644 test/miscellaneous/gitignore
>>  create mode 100644 test/miscellaneous/odp_api_from_cpp.cpp
>>
>> diff --git a/configure.ac b/configure.ac
>> index e5c1c56..7d45ece 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -13,6 +13,8 @@ AM_SILENT_RULES([yes])
>>  AC_PROG_CC
>>  AM_PROG_CC_C_O
>>
>> +AC_PROG_CXX
>> +
>>  AC_PROG_INSTALL
>>  AC_PROG_MAKE_SET
>>
>> @@ -114,6 +116,20 @@ AC_ARG_ENABLE([test-perf],
>>  AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ])
>>
>>
>>  ##########################################################################
>> +# Enable/disable test-cpp
>>
>> +##########################################################################
>> +test_cpp=no
>> +AC_ARG_ENABLE([test-cpp],
>> +    [  --enable-test-cpp       run basic test aginast cpp],
>> +    [if test "x$enableval" = "xyes"; then
>> +        test_cpp=yes
>> +     else
>> +        test_cpp=no
>> +    fi])
>> +
>> +AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
>> +
>>
>> +##########################################################################
>>  # Set optional CUnit path
>>
>>  ##########################################################################
>>  AC_ARG_WITH([cunit-path],
>> @@ -228,6 +244,7 @@ ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef
>> -Wwrite-strings"
>>  # Default include setup
>>
>>  ##########################################################################
>>  AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS"
>> +AM_CXXFLAGS="-std=c++11"
>>
>>  AC_CONFIG_FILES([Makefile
>>                  doc/Makefile
>> @@ -244,6 +261,7 @@ AC_CONFIG_FILES([Makefile
>>                  test/api_test/Makefile
>>                  test/performance/Makefile
>>                  test/validation/Makefile
>> +                test/miscellaneous/Makefile
>>                  ])
>>
>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>> @@ -276,6 +294,7 @@ AC_MSG_RESULT([
>>         cc:                     ${CC}
>>         cppflags:               ${CPPFLAGS}
>>         am_cppflags:            ${AM_CPPFLAGS}
>> +       am_cxxflags:            ${AM_CXXFLAGS}
>>         cflags:                 ${CFLAGS}
>>         am_cflags:              ${AM_CFLAGS}
>>         ldflags:                ${LDFLAGS}
>> @@ -284,4 +303,5 @@ AC_MSG_RESULT([
>>         cunit:                  ${cunit_support}
>>         test_vald:              ${test_vald}
>>         test_perf:              ${test_perf}
>> +       test_cpp:               ${test_cpp}
>>  ])
>> diff --git a/test/Makefile.am b/test/Makefile.am
>> index ec2b248..2ba8008 100644
>> --- a/test/Makefile.am
>> +++ b/test/Makefile.am
>> @@ -1,4 +1,4 @@
>> -SUBDIRS = api_test performance
>> +SUBDIRS = api_test performance miscellaneous
>>
>>  if cunit_support
>>      SUBDIRS += validation
>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>> index ebee80a..93ead25 100644
>> --- a/test/Makefile.inc
>> +++ b/test/Makefile.inc
>> @@ -2,12 +2,13 @@ include $(top_srcdir)/Makefile.inc
>>  include $(top_srcdir)/platform/@with_platform@/Makefile.inc
>>  LIB   = $(top_builddir)/lib
>>  LDADD = $(LIB)/libodp.la
>> -AM_CFLAGS += \
>> -       -I$(srcdir) \
>> +INCFLAGS = -I$(srcdir) \
>>         -I$(top_srcdir)/test \
>>         -I$(top_srcdir)/platform/@with_platform@/include \
>>         -I$(top_srcdir)/platform/linux-generic/include \
>>         -I$(top_srcdir)/include \
>>         -I$(top_srcdir)/helper/include
>> +AM_CFLAGS += $(INCFLAGS)
>> +AM_CXXFLAGS = $(INCFLAGS)
>>
>>  AM_LDFLAGS += -L$(LIB)
>> diff --git a/test/miscellaneous/.gitignore b/test/miscellaneous/.gitignore
>> new file mode 100644
>> index 0000000..134df38
>> --- /dev/null
>> +++ b/test/miscellaneous/.gitignore
>> @@ -0,0 +1 @@
>> +odp_api_from_cpp
>> diff --git a/test/miscellaneous/Makefile.am
>> b/test/miscellaneous/Makefile.am
>> new file mode 100644
>> index 0000000..863643c
>> --- /dev/null
>> +++ b/test/miscellaneous/Makefile.am
>> @@ -0,0 +1,12 @@
>> +include $(top_srcdir)/test/Makefile.inc
>> +
>> +if test_cpp
>> +bin_PROGRAMS =  odp_api_from_cpp
>> +TESTS = odp_api_from_cpp
>> +endif
>> +
>> +odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
>> +
>> +odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static
>> +
>> +dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp
>> diff --git a/test/miscellaneous/gitignore b/test/miscellaneous/gitignore
>> new file mode 100644
>> index 0000000..134df38
>> --- /dev/null
>> +++ b/test/miscellaneous/gitignore
>> @@ -0,0 +1 @@
>> +odp_api_from_cpp
>> diff --git a/test/miscellaneous/odp_api_from_cpp.cpp
>> b/test/miscellaneous/odp_api_from_cpp.cpp
>> new file mode 100644
>> index 0000000..e62ef8d
>> --- /dev/null
>> +++ b/test/miscellaneous/odp_api_from_cpp.cpp
>> @@ -0,0 +1,12 @@
>> +#include <cstdio>
>> +#include <odp.h>
>> +#include <odp/helper/linux.h>
>> +
>> +int main(int argc, const char *argv[])
>> +{
>> +
>> +       printf("\tODP API version: %s\n", odp_version_api_str());
>> +       printf("\tODP implementation version: %s\n",
>> odp_version_impl_str());
>> +
>> +       return 0;
>> +}
>> --
>> 2.1.0
>>
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/lng-odp
>>
>
>
Bill Fischofer Feb. 25, 2015, 10:21 p.m. UTC | #3 
OK, with that caveat:

Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org>

On Wed, Feb 25, 2015 at 4:20 PM, Mike Holmes <mike.holmes@linaro.org> wrote:

> As per the previous versions, that is a checkpatch bug, it thinks you want
> to CC a mailing list.
>
> On 25 February 2015 at 17:18, Bill Fischofer <bill.fischofer@linaro.org>
> wrote:
>
>> apply-and-build for this gives the following error:
>>
>> Using patch: 0001-test-miscellaneous-Add-CPP-test.patch
>>   Trying to apply patch
>>   Patch applied
>> WARNING: Do not use whitespace before Cc:
>> #76: FILE: configure.ac:294:
>>   cc: ${CC}
>>
>> WARNING: Use a single space after Cc:
>> #76: FILE: configure.ac:294:
>>   cc: ${CC}
>>
>> ERROR: Unrecognized email address: '${CC}'
>> #76: FILE: configure.ac:294:
>>   cc: ${CC}
>>
>> total: 1 errors, 2 warnings, 0 checks, 100 lines checked
>>
>> NOTE: Ignored message types: DEPRECATED_VARIABLE NEW_TYPEDEFS
>>
>> /home/bill/linaro/cpptest/0001-test-miscellaneous-Add-CPP-test.patch has
>> style problems, please review.
>>
>>
>> On Wed, Feb 25, 2015 at 4:04 PM, Mike Holmes <mike.holmes@linaro.org>
>> wrote:
>>
>>> From: Simon Kagstrom <simon.kagstrom@netinsight.net>
>>>
>>> Add conditional test to link and run ODP from a cpp application.
>>>
>>> Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
>>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
>>> ---
>>> v4
>>> Disable by default, use --enable-test-cpp to see C++ test and the
>>> warnings it generates.
>>>
>>>  configure.ac                            | 20 ++++++++++++++++++++
>>>  test/Makefile.am                        |  2 +-
>>>  test/Makefile.inc                       |  5 +++--
>>>  test/miscellaneous/.gitignore           |  1 +
>>>  test/miscellaneous/Makefile.am          | 12 ++++++++++++
>>>  test/miscellaneous/gitignore            |  1 +
>>>  test/miscellaneous/odp_api_from_cpp.cpp | 12 ++++++++++++
>>>  7 files changed, 50 insertions(+), 3 deletions(-)
>>>  create mode 100644 test/miscellaneous/.gitignore
>>>  create mode 100644 test/miscellaneous/Makefile.am
>>>  create mode 100644 test/miscellaneous/gitignore
>>>  create mode 100644 test/miscellaneous/odp_api_from_cpp.cpp
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index e5c1c56..7d45ece 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -13,6 +13,8 @@ AM_SILENT_RULES([yes])
>>>  AC_PROG_CC
>>>  AM_PROG_CC_C_O
>>>
>>> +AC_PROG_CXX
>>> +
>>>  AC_PROG_INSTALL
>>>  AC_PROG_MAKE_SET
>>>
>>> @@ -114,6 +116,20 @@ AC_ARG_ENABLE([test-perf],
>>>  AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ])
>>>
>>>
>>>  ##########################################################################
>>> +# Enable/disable test-cpp
>>>
>>> +##########################################################################
>>> +test_cpp=no
>>> +AC_ARG_ENABLE([test-cpp],
>>> +    [  --enable-test-cpp       run basic test aginast cpp],
>>> +    [if test "x$enableval" = "xyes"; then
>>> +        test_cpp=yes
>>> +     else
>>> +        test_cpp=no
>>> +    fi])
>>> +
>>> +AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
>>> +
>>>
>>> +##########################################################################
>>>  # Set optional CUnit path
>>>
>>>  ##########################################################################
>>>  AC_ARG_WITH([cunit-path],
>>> @@ -228,6 +244,7 @@ ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef
>>> -Wwrite-strings"
>>>  # Default include setup
>>>
>>>  ##########################################################################
>>>  AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS"
>>> +AM_CXXFLAGS="-std=c++11"
>>>
>>>  AC_CONFIG_FILES([Makefile
>>>                  doc/Makefile
>>> @@ -244,6 +261,7 @@ AC_CONFIG_FILES([Makefile
>>>                  test/api_test/Makefile
>>>                  test/performance/Makefile
>>>                  test/validation/Makefile
>>> +                test/miscellaneous/Makefile
>>>                  ])
>>>
>>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>>> @@ -276,6 +294,7 @@ AC_MSG_RESULT([
>>>         cc:                     ${CC}
>>>         cppflags:               ${CPPFLAGS}
>>>         am_cppflags:            ${AM_CPPFLAGS}
>>> +       am_cxxflags:            ${AM_CXXFLAGS}
>>>         cflags:                 ${CFLAGS}
>>>         am_cflags:              ${AM_CFLAGS}
>>>         ldflags:                ${LDFLAGS}
>>> @@ -284,4 +303,5 @@ AC_MSG_RESULT([
>>>         cunit:                  ${cunit_support}
>>>         test_vald:              ${test_vald}
>>>         test_perf:              ${test_perf}
>>> +       test_cpp:               ${test_cpp}
>>>  ])
>>> diff --git a/test/Makefile.am b/test/Makefile.am
>>> index ec2b248..2ba8008 100644
>>> --- a/test/Makefile.am
>>> +++ b/test/Makefile.am
>>> @@ -1,4 +1,4 @@
>>> -SUBDIRS = api_test performance
>>> +SUBDIRS = api_test performance miscellaneous
>>>
>>>  if cunit_support
>>>      SUBDIRS += validation
>>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>>> index ebee80a..93ead25 100644
>>> --- a/test/Makefile.inc
>>> +++ b/test/Makefile.inc
>>> @@ -2,12 +2,13 @@ include $(top_srcdir)/Makefile.inc
>>>  include $(top_srcdir)/platform/@with_platform@/Makefile.inc
>>>  LIB   = $(top_builddir)/lib
>>>  LDADD = $(LIB)/libodp.la
>>> -AM_CFLAGS += \
>>> -       -I$(srcdir) \
>>> +INCFLAGS = -I$(srcdir) \
>>>         -I$(top_srcdir)/test \
>>>         -I$(top_srcdir)/platform/@with_platform@/include \
>>>         -I$(top_srcdir)/platform/linux-generic/include \
>>>         -I$(top_srcdir)/include \
>>>         -I$(top_srcdir)/helper/include
>>> +AM_CFLAGS += $(INCFLAGS)
>>> +AM_CXXFLAGS = $(INCFLAGS)
>>>
>>>  AM_LDFLAGS += -L$(LIB)
>>> diff --git a/test/miscellaneous/.gitignore
>>> b/test/miscellaneous/.gitignore
>>> new file mode 100644
>>> index 0000000..134df38
>>> --- /dev/null
>>> +++ b/test/miscellaneous/.gitignore
>>> @@ -0,0 +1 @@
>>> +odp_api_from_cpp
>>> diff --git a/test/miscellaneous/Makefile.am
>>> b/test/miscellaneous/Makefile.am
>>> new file mode 100644
>>> index 0000000..863643c
>>> --- /dev/null
>>> +++ b/test/miscellaneous/Makefile.am
>>> @@ -0,0 +1,12 @@
>>> +include $(top_srcdir)/test/Makefile.inc
>>> +
>>> +if test_cpp
>>> +bin_PROGRAMS =  odp_api_from_cpp
>>> +TESTS = odp_api_from_cpp
>>> +endif
>>> +
>>> +odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
>>> +
>>> +odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static
>>> +
>>> +dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp
>>> diff --git a/test/miscellaneous/gitignore b/test/miscellaneous/gitignore
>>> new file mode 100644
>>> index 0000000..134df38
>>> --- /dev/null
>>> +++ b/test/miscellaneous/gitignore
>>> @@ -0,0 +1 @@
>>> +odp_api_from_cpp
>>> diff --git a/test/miscellaneous/odp_api_from_cpp.cpp
>>> b/test/miscellaneous/odp_api_from_cpp.cpp
>>> new file mode 100644
>>> index 0000000..e62ef8d
>>> --- /dev/null
>>> +++ b/test/miscellaneous/odp_api_from_cpp.cpp
>>> @@ -0,0 +1,12 @@
>>> +#include <cstdio>
>>> +#include <odp.h>
>>> +#include <odp/helper/linux.h>
>>> +
>>> +int main(int argc, const char *argv[])
>>> +{
>>> +
>>> +       printf("\tODP API version: %s\n", odp_version_api_str());
>>> +       printf("\tODP implementation version: %s\n",
>>> odp_version_impl_str());
>>> +
>>> +       return 0;
>>> +}
>>> --
>>> 2.1.0
>>>
>>>
>>> _______________________________________________
>>> lng-odp mailing list
>>> lng-odp@lists.linaro.org
>>> http://lists.linaro.org/mailman/listinfo/lng-odp
>>>
>>
>>
>
>
> --
> *Mike Holmes*
> Linaro  Sr Technical Manager
> LNG - ODP
>
Maxim Uvarov Feb. 26, 2015, 11:27 a.m. UTC | #4 
Merged.
Maxim.

On 02/26/2015 01:21 AM, Bill Fischofer wrote:
> OK, with that caveat:
>
> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org 
> <mailto:bill.fischofer@linaro.org>>
>
> On Wed, Feb 25, 2015 at 4:20 PM, Mike Holmes <mike.holmes@linaro.org 
> <mailto:mike.holmes@linaro.org>> wrote:
>
>     As per the previous versions, that is a checkpatch bug, it thinks
>     you want to CC a mailing list.
>
>     On 25 February 2015 at 17:18, Bill Fischofer
>     <bill.fischofer@linaro.org <mailto:bill.fischofer@linaro.org>> wrote:
>
>         apply-and-build for this gives the following error:
>
>         Using patch: 0001-test-miscellaneous-Add-CPP-test.patch
>           Trying to apply patch
>           Patch applied
>         WARNING: Do not use whitespace before Cc:
>         #76: FILE: configure.ac:294 <http://configure.ac:294>:
>         cc:${CC}
>
>         WARNING: Use a single space after Cc:
>         #76: FILE: configure.ac:294 <http://configure.ac:294>:
>         cc:${CC}
>
>         ERROR: Unrecognized email address: '${CC}'
>         #76: FILE: configure.ac:294 <http://configure.ac:294>:
>         cc:${CC}
>
>         total: 1 errors, 2 warnings, 0 checks, 100 lines checked
>
>         NOTE: Ignored message types: DEPRECATED_VARIABLE NEW_TYPEDEFS
>
>         /home/bill/linaro/cpptest/0001-test-miscellaneous-Add-CPP-test.patch
>         has style problems, please review.
>
>
>         On Wed, Feb 25, 2015 at 4:04 PM, Mike Holmes
>         <mike.holmes@linaro.org <mailto:mike.holmes@linaro.org>> wrote:
>
>             From: Simon Kagstrom <simon.kagstrom@netinsight.net
>             <mailto:simon.kagstrom@netinsight.net>>
>
>             Add conditional test to link and run ODP from a cpp
>             application.
>
>             Signed-off-by: Simon Kagstrom
>             <simon.kagstrom@netinsight.net
>             <mailto:simon.kagstrom@netinsight.net>>
>             Signed-off-by: Mike Holmes <mike.holmes@linaro.org
>             <mailto:mike.holmes@linaro.org>>
>             ---
>             v4
>             Disable by default, use --enable-test-cpp to see C++ test
>             and the
>             warnings it generates.
>
>             configure.ac <http://configure.ac>                       |
>             20 ++++++++++++++++++++
>              test/Makefile.am |  2 +-
>              test/Makefile.inc  |  5 +++--
>              test/miscellaneous/.gitignore  |  1 +
>              test/miscellaneous/Makefile.am | 12 ++++++++++++
>              test/miscellaneous/gitignore |  1 +
>              test/miscellaneous/odp_api_from_cpp.cpp | 12 ++++++++++++
>              7 files changed, 50 insertions(+), 3 deletions(-)
>              create mode 100644 test/miscellaneous/.gitignore
>              create mode 100644 test/miscellaneous/Makefile.am
>              create mode 100644 test/miscellaneous/gitignore
>              create mode 100644 test/miscellaneous/odp_api_from_cpp.cpp
>
>             diff --git a/configure.ac <http://configure.ac>
>             b/configure.ac <http://configure.ac>
>             index e5c1c56..7d45ece 100644
>             --- a/configure.ac <http://configure.ac>
>             +++ b/configure.ac <http://configure.ac>
>             @@ -13,6 +13,8 @@ AM_SILENT_RULES([yes])
>              AC_PROG_CC
>              AM_PROG_CC_C_O
>
>             +AC_PROG_CXX
>             +
>              AC_PROG_INSTALL
>              AC_PROG_MAKE_SET
>
>             @@ -114,6 +116,20 @@ AC_ARG_ENABLE([test-perf],
>              AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ])
>
>              ##########################################################################
>             +# Enable/disable test-cpp
>             +##########################################################################
>             +test_cpp=no
>             +AC_ARG_ENABLE([test-cpp],
>             +    [  --enable-test-cpp       run basic test aginast cpp],
>             +    [if test "x$enableval" = "xyes"; then
>             +        test_cpp=yes
>             +     else
>             +        test_cpp=no
>             +    fi])
>             +
>             +AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
>             +
>             +##########################################################################
>              # Set optional CUnit path
>              ##########################################################################
>              AC_ARG_WITH([cunit-path],
>             @@ -228,6 +244,7 @@ ODP_CFLAGS="$ODP_CFLAGS
>             -Wformat-security -Wundef -Wwrite-strings"
>              # Default include setup
>              ##########################################################################
>              AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS"
>             +AM_CXXFLAGS="-std=c++11"
>
>              AC_CONFIG_FILES([Makefile
>                              doc/Makefile
>             @@ -244,6 +261,7 @@ AC_CONFIG_FILES([Makefile
>                              test/api_test/Makefile
>              test/performance/Makefile
>              test/validation/Makefile
>             + test/miscellaneous/Makefile
>                              ])
>
>              AC_SEARCH_LIBS([timer_create],[rt posix4])
>             @@ -276,6 +294,7 @@ AC_MSG_RESULT([
>                     cc:                     ${CC}
>                     cppflags:  ${CPPFLAGS}
>                     am_cppflags: ${AM_CPPFLAGS}
>             +       am_cxxflags: ${AM_CXXFLAGS}
>                     cflags:  ${CFLAGS}
>                     am_cflags: ${AM_CFLAGS}
>                     ldflags: ${LDFLAGS}
>             @@ -284,4 +303,5 @@ AC_MSG_RESULT([
>                     cunit: ${cunit_support}
>                     test_vald: ${test_vald}
>                     test_perf: ${test_perf}
>             +       test_cpp:  ${test_cpp}
>              ])
>             diff --git a/test/Makefile.am b/test/Makefile.am
>             index ec2b248..2ba8008 100644
>             --- a/test/Makefile.am
>             +++ b/test/Makefile.am
>             @@ -1,4 +1,4 @@
>             -SUBDIRS = api_test performance
>             +SUBDIRS = api_test performance miscellaneous
>
>              if cunit_support
>                  SUBDIRS += validation
>             diff --git a/test/Makefile.inc b/test/Makefile.inc
>             index ebee80a..93ead25 100644
>             --- a/test/Makefile.inc
>             +++ b/test/Makefile.inc
>             @@ -2,12 +2,13 @@ include $(top_srcdir)/Makefile.inc
>              include $(top_srcdir)/platform/@with_platform@/Makefile.inc
>              LIB   = $(top_builddir)/lib
>              LDADD = $(LIB)/libodp.la <http://libodp.la>
>             -AM_CFLAGS += \
>             -       -I$(srcdir) \
>             +INCFLAGS = -I$(srcdir) \
>                     -I$(top_srcdir)/test \
>             -I$(top_srcdir)/platform/@with_platform@/include \
>             -I$(top_srcdir)/platform/linux-generic/include \
>                     -I$(top_srcdir)/include \
>                     -I$(top_srcdir)/helper/include
>             +AM_CFLAGS += $(INCFLAGS)
>             +AM_CXXFLAGS = $(INCFLAGS)
>
>              AM_LDFLAGS += -L$(LIB)
>             diff --git a/test/miscellaneous/.gitignore
>             b/test/miscellaneous/.gitignore
>             new file mode 100644
>             index 0000000..134df38
>             --- /dev/null
>             +++ b/test/miscellaneous/.gitignore
>             @@ -0,0 +1 @@
>             +odp_api_from_cpp
>             diff --git a/test/miscellaneous/Makefile.am
>             b/test/miscellaneous/Makefile.am
>             new file mode 100644
>             index 0000000..863643c
>             --- /dev/null
>             +++ b/test/miscellaneous/Makefile.am
>             @@ -0,0 +1,12 @@
>             +include $(top_srcdir)/test/Makefile.inc
>             +
>             +if test_cpp
>             +bin_PROGRAMS =  odp_api_from_cpp
>             +TESTS = odp_api_from_cpp
>             +endif
>             +
>             +odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
>             +
>             +odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static
>             +
>             +dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp
>             diff --git a/test/miscellaneous/gitignore
>             b/test/miscellaneous/gitignore
>             new file mode 100644
>             index 0000000..134df38
>             --- /dev/null
>             +++ b/test/miscellaneous/gitignore
>             @@ -0,0 +1 @@
>             +odp_api_from_cpp
>             diff --git a/test/miscellaneous/odp_api_from_cpp.cpp
>             b/test/miscellaneous/odp_api_from_cpp.cpp
>             new file mode 100644
>             index 0000000..e62ef8d
>             --- /dev/null
>             +++ b/test/miscellaneous/odp_api_from_cpp.cpp
>             @@ -0,0 +1,12 @@
>             +#include <cstdio>
>             +#include <odp.h>
>             +#include <odp/helper/linux.h>
>             +
>             +int main(int argc, const char *argv[])
>             +{
>             +
>             +       printf("\tODP API version: %s\n",
>             odp_version_api_str());
>             +       printf("\tODP implementation version: %s\n",
>             odp_version_impl_str());
>             +
>             +       return 0;
>             +}
>             --
>             2.1.0
>
>
>             _______________________________________________
>             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
>
>
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
diff mbox

Patch

diff --git a/configure.ac b/configure.ac
index e5c1c56..7d45ece 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,8 @@  AM_SILENT_RULES([yes])
 AC_PROG_CC
 AM_PROG_CC_C_O
 
+AC_PROG_CXX
+
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
@@ -114,6 +116,20 @@  AC_ARG_ENABLE([test-perf],
 AM_CONDITIONAL([test_perf], [test x$test_perf = xyes ])
 
 ##########################################################################
+# Enable/disable test-cpp
+##########################################################################
+test_cpp=no
+AC_ARG_ENABLE([test-cpp],
+    [  --enable-test-cpp       run basic test aginast cpp],
+    [if test "x$enableval" = "xyes"; then
+        test_cpp=yes
+     else
+        test_cpp=no
+    fi])
+
+AM_CONDITIONAL([test_cpp], [test x$test_cpp = xyes ])
+
+##########################################################################
 # Set optional CUnit path
 ##########################################################################
 AC_ARG_WITH([cunit-path],
@@ -228,6 +244,7 @@  ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
 # Default include setup
 ##########################################################################
 AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS"
+AM_CXXFLAGS="-std=c++11"
 
 AC_CONFIG_FILES([Makefile
 		 doc/Makefile
@@ -244,6 +261,7 @@  AC_CONFIG_FILES([Makefile
 		 test/api_test/Makefile
 		 test/performance/Makefile
 		 test/validation/Makefile
+		 test/miscellaneous/Makefile
 		 ])
 
 AC_SEARCH_LIBS([timer_create],[rt posix4])
@@ -276,6 +294,7 @@  AC_MSG_RESULT([
 	cc:			${CC}
 	cppflags:		${CPPFLAGS}
 	am_cppflags:		${AM_CPPFLAGS}
+	am_cxxflags:		${AM_CXXFLAGS}
 	cflags:			${CFLAGS}
 	am_cflags:		${AM_CFLAGS}
 	ldflags:		${LDFLAGS}
@@ -284,4 +303,5 @@  AC_MSG_RESULT([
 	cunit:			${cunit_support}
 	test_vald:		${test_vald}
 	test_perf:		${test_perf}
+	test_cpp:		${test_cpp}
 ])
diff --git a/test/Makefile.am b/test/Makefile.am
index ec2b248..2ba8008 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@ 
-SUBDIRS = api_test performance
+SUBDIRS = api_test performance miscellaneous
 
 if cunit_support
     SUBDIRS += validation
diff --git a/test/Makefile.inc b/test/Makefile.inc
index ebee80a..93ead25 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -2,12 +2,13 @@  include $(top_srcdir)/Makefile.inc
 include $(top_srcdir)/platform/@with_platform@/Makefile.inc
 LIB   = $(top_builddir)/lib
 LDADD = $(LIB)/libodp.la
-AM_CFLAGS += \
-	-I$(srcdir) \
+INCFLAGS = -I$(srcdir) \
 	-I$(top_srcdir)/test \
 	-I$(top_srcdir)/platform/@with_platform@/include \
 	-I$(top_srcdir)/platform/linux-generic/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/helper/include
+AM_CFLAGS += $(INCFLAGS)
+AM_CXXFLAGS = $(INCFLAGS)
 
 AM_LDFLAGS += -L$(LIB)
diff --git a/test/miscellaneous/.gitignore b/test/miscellaneous/.gitignore
new file mode 100644
index 0000000..134df38
--- /dev/null
+++ b/test/miscellaneous/.gitignore
@@ -0,0 +1 @@ 
+odp_api_from_cpp
diff --git a/test/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am
new file mode 100644
index 0000000..863643c
--- /dev/null
+++ b/test/miscellaneous/Makefile.am
@@ -0,0 +1,12 @@ 
+include $(top_srcdir)/test/Makefile.inc
+
+if test_cpp
+bin_PROGRAMS =  odp_api_from_cpp
+TESTS = odp_api_from_cpp
+endif
+
+odp_api_from_cpp_CXXFLAGS = $(AM_CXXFLAGS)
+
+odp_api_from_cpp_LDFLAGS = $(AM_LDFLAGS) -static
+
+dist_odp_api_from_cpp_SOURCES = odp_api_from_cpp.cpp
diff --git a/test/miscellaneous/gitignore b/test/miscellaneous/gitignore
new file mode 100644
index 0000000..134df38
--- /dev/null
+++ b/test/miscellaneous/gitignore
@@ -0,0 +1 @@ 
+odp_api_from_cpp
diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp
new file mode 100644
index 0000000..e62ef8d
--- /dev/null
+++ b/test/miscellaneous/odp_api_from_cpp.cpp
@@ -0,0 +1,12 @@ 
+#include <cstdio>
+#include <odp.h>
+#include <odp/helper/linux.h>
+
+int main(int argc, const char *argv[])
+{
+
+	printf("\tODP API version: %s\n", odp_version_api_str());
+	printf("\tODP implementation version: %s\n", odp_version_impl_str());
+
+	return 0;
+}