[aravis] build: move unit tests to $(top_srcdir)/tests.
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aravis] build: move unit tests to $(top_srcdir)/tests.
- Date: Fri, 6 Aug 2010 09:17:56 +0000 (UTC)
commit 94b0095f7277077c10afb936330dc32b5eb783df
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Fri Aug 6 11:17:22 2010 +0200
build: move unit tests to $(top_srcdir)/tests.
Makefile.am | 2 +-
configure.ac | 2 +-
src/Makefile.am | 2 --
src/tests/Makefile.am | 15 ---------------
{src/tests => tests}/.gitignore | 0
tests/Makefile.am | 19 +++++++++++++++++++
{test => tests/data}/genicam.xml | 0
{test => tests/data}/pipelines.txt | 0
{src/tests => tests}/evaluator.c | 0
{src/tests => tests}/fake.c | 0
{test => tests/js}/arv-camera-test.js | 0
{test => tests/js}/arv-evaluator-test.js | 0
{test => tests/js}/arv-fake-test.js | 0
13 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 67eda23..85f52af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
-SUBDIRS = src gst po docs
+SUBDIRS = src gst tests po docs
aravisdocdir = ${prefix}/doc/aravis
aravisdoc_DATA = \
diff --git a/configure.ac b/configure.ac
index 680372c..895e6d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,8 @@ AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes" || test ! -f "
AC_CONFIG_FILES([
Makefile
src/Makefile
-src/tests/Makefile
gst/Makefile
+tests/Makefile
po/Makefile.in
docs/Makefile
docs/reference/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 9816283..d1d7fc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,6 @@ EXTRA_DIST =
include $(top_srcdir)/Makefile.decl
-SUBDIRS = . tests
-
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
diff --git a/src/tests/.gitignore b/tests/.gitignore
similarity index 100%
rename from src/tests/.gitignore
rename to tests/.gitignore
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..fdf98f2
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,19 @@
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES = -g -I$(top_srcdir)/src/ $(ARAVIS_CFLAGS)
+
+noinst_PROGRAMS = $(TEST_PROGS)
+
+test_progs_ldadd = \
+ $(top_builddir)/src/libaravis.la \
+ $(ARAVIS_LIBS)
+
+TEST_PROGS += evaluator fake
+
+evaluator_SOURCES = evaluator.c
+evaluator_LDADD = $(test_progs_ldadd)
+
+fake_SOURCES = fake.c
+fake_CFLAGS = -DGENICAM_FILENAME="\"../src/arv-fake-camera.xml\""
+fake_LDADD = $(test_progs_ldadd)
+
diff --git a/test/genicam.xml b/tests/data/genicam.xml
similarity index 100%
rename from test/genicam.xml
rename to tests/data/genicam.xml
diff --git a/test/pipelines.txt b/tests/data/pipelines.txt
similarity index 100%
rename from test/pipelines.txt
rename to tests/data/pipelines.txt
diff --git a/src/tests/evaluator.c b/tests/evaluator.c
similarity index 100%
rename from src/tests/evaluator.c
rename to tests/evaluator.c
diff --git a/src/tests/fake.c b/tests/fake.c
similarity index 100%
rename from src/tests/fake.c
rename to tests/fake.c
diff --git a/test/arv-camera-test.js b/tests/js/arv-camera-test.js
similarity index 100%
rename from test/arv-camera-test.js
rename to tests/js/arv-camera-test.js
diff --git a/test/arv-evaluator-test.js b/tests/js/arv-evaluator-test.js
similarity index 100%
rename from test/arv-evaluator-test.js
rename to tests/js/arv-evaluator-test.js
diff --git a/test/arv-fake-test.js b/tests/js/arv-fake-test.js
similarity index 100%
rename from test/arv-fake-test.js
rename to tests/js/arv-fake-test.js
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]