aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon Kagstrom <simon.kagstrom@netinsight.net>2015-02-25 17:04:17 -0500
committerMaxim Uvarov <maxim.uvarov@linaro.org>2015-02-26 14:23:47 +0300
commit25270ef02b18b55e26a1401b7c551c244669fa11 (patch)
tree4e66da9731da6b0df099badcff5a6991097ec8b2 /test
parentc0251a13eddbfb42212f276a3d18c8e343f38f3b (diff)
test: miscellaneous: Add CPP test
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> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am2
-rw-r--r--test/Makefile.inc5
-rw-r--r--test/miscellaneous/.gitignore1
-rw-r--r--test/miscellaneous/Makefile.am12
-rw-r--r--test/miscellaneous/gitignore1
-rw-r--r--test/miscellaneous/odp_api_from_cpp.cpp12
6 files changed, 30 insertions, 3 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index ec2b24870..2ba8008e7 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 ebee80ae2..93ead25ed 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 000000000..134df3837
--- /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 000000000..863643c9f
--- /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 000000000..134df3837
--- /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 000000000..e62ef8d51
--- /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;
+}