[rygel] tests: Reenable some
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] tests: Reenable some
- Date: Sat, 27 Feb 2016 06:19:39 +0000 (UTC)
commit 439ae5f1c11d8dd3c2cd5f9a8e906a39ed4f3f99
Author: Jens Georg <mail jensge org>
Date: Fri Feb 26 21:09:11 2016 +0100
tests: Reenable some
Signed-off-by: Jens Georg <mail jensge org>
configure.ac | 1 +
tests/Makefile.am | 291 +++++++++++++++++++------------------
tests/rygel-user-config-test.vala | 15 --
3 files changed, 147 insertions(+), 160 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7886fd2..92a0294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -544,6 +544,7 @@ examples/server-plugins/vala/Makefile
examples/server-plugins/vala/example-server-vala.plugin
examples/server-plugins/C/Makefile
examples/server-plugins/C/example-server-c.plugin
+tests/Makefile
])
AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a6040d8..3bd1167 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,19 +2,20 @@ include $(top_srcdir)/common.am
AUTOMAKE_OPTIONS = subdir-objects
-check_PROGRAMS = rygel-http-item-uri-test \
- rygel-http-response-test \
- rygel-http-byte-seek-test \
- rygel-http-time-seek-test \
- rygel-http-get-test \
- rygel-http-post-test \
- rygel-searchable-container-test \
- rygel-object-creator-test \
- rygel-user-config-test \
- rygel-regression \
- rygel-media-engine-test
+#check_PROGRAMS = rygel-http-item-uri-test \
+# rygel-http-response-test \
+# rygel-http-byte-seek-test \
+# rygel-http-time-seek-test \
+# rygel-http-get-test \
+# rygel-http-post-test \
+# rygel-searchable-container-test \
+# rygel-object-creator-test \
+# rygel-user-config-test \
+# rygel-regression \
+# rygel-media-engine-test
-check_PROGRAMS =
+check_PROGRAMS = rygel-regression \
+ rygel-user-config-test
TESTS = $(check_PROGRAMS)
@@ -49,104 +50,104 @@ test_server_libs = \
# Note that the non-test sources here are symlinked from their
# various source directories.
# TODO: Mention their relative paths instead, to make this clearer?
-rygel_http_item_uri_test_SOURCES = rygel-http-item-uri-test.vala \
- rygel-http-item-uri.vala
-rygel_http_item_uri_test_VALAFLAGS = \
- $(test_valaflags)
-rygel_http_item_uri_test_CFLAGS = \
- $(test_cflags)
-rygel_http_item_uri_test_LDADD = \
- $(test_libs)
-
-rygel_http_response_test_SOURCES = rygel-http-response-test.vala \
- rygel-http-response.vala \
- rygel-state-machine_http-response.vala \
- rygel-data-source_http-response.vala \
- rygel-data-sink_http-response.vala
-rygel_http_response_test_VALAFLAGS = \
- $(test_valaflags)
-rygel_http_response_test_CFLAGS = \
- $(test_cflags)
-rygel_http_response_test_LDADD = \
- $(test_libs)
-
-rygel_http_byte_seek_test_SOURCES = rygel-http-byte-seek-test.vala \
- rygel-http-byte-seek.vala \
- rygel-http-seek.vala
-rygel_http_byte_seek_test_VALAFLAGS = \
- $(test_valaflags)
-rygel_http_byte_seek_test_CFLAGS = \
- $(test_cflags)
-rygel_http_byte_seek_test_LDADD = $(test_libs)
-
-rygel_http_time_seek_test_SOURCES = rygel-http-time-seek-test.vala \
- rygel-http-time-seek.vala \
- rygel-http-seek_time-seek.vala
-rygel_http_time_seek_test_VALAFLAGS = \
- $(test_valaflags)
-rygel_http_time_seek_test_CFLAGS = \
- $(test_cflags)
-rygel_http_time_seek_test_LDADD = \
- $(test_libs)
-
-rygel_http_get_test_SOURCES = rygel-http-get-test.vala \
- rygel-http-get.vala \
- rygel-http-request_http-get.vala \
- rygel-http-item-uri_http-get.vala \
- rygel-state-machine_http-get.vala \
- rygel-http-time-seek_http-get.vala \
- rygel-http-byte-seek_http-get.vala \
- rygel-http-seek_http-get.vala
-rygel_http_get_test_VALAFLAGS = \
- $(test_valaflags)
-rygel_http_get_test_CFLAGS = \
- $(test_cflags)
-rygel_http_get_test_LDADD = \
- $(test_libs)
-
-rygel_http_post_test_SOURCES = rygel-http-post-test.vala \
- rygel-http-post.vala \
- rygel-http-request_http-post.vala \
- rygel-http-item-uri_http-post.vala \
- rygel-state-machine_http-post.vala
-rygel_http_post_test_VALAFLAGS = $(test_valaflags) \
- --pkg gupnp-av-1.0
-rygel_http_post_test_CFLAGS = \
- $(test_cflags)
-rygel_http_post_test_LDADD = \
- $(test_libs)
-
-rygel_searchable_container_test_SOURCES = \
- rygel-searchable-container.vala \
- rygel-searchable-container-test.vala
-rygel_searchable_container_test_VALAFLAGS = \
- $(test_valaflags) \
- --pkg gupnp-av-1.0
-rygel_searchable_container_test_CFLAGS = \
- $(test_cflags)
-rygel_searchable_container_test_LDADD = \
- $(test_libs)
-
-rygel_object_creator_test_SOURCES = rygel-object-creator-test.vala \
- rygel-object-creator.vala \
- rygel-data-source.vala \
- rygel-dlna-profile.vala \
- rygel-http-seek_object-creator.vala \
- rygel-state-machine_object-creator.vala \
- rygel-relational-expression.vala \
- rygel-logical-expression.vala \
- rygel-search-expression.vala \
- rygel-search-criteria-parser.vala \
- rygel-serializer_object-creator.vala \
- rygel-m3u-playlist_object-creator.vala
-rygel_object_creator_test_VALAFLAGS = \
- $(test_valaflags) \
- --pkg uuid
-rygel_object_creator_test_CFLAGS = \
- $(test_cflags)
-rygel_object_creator_test_LDADD = \
- $(test_libs)
-
+#rygel_http_item_uri_test_SOURCES = rygel-http-item-uri-test.vala \
+# rygel-http-item-uri.vala
+#rygel_http_item_uri_test_VALAFLAGS = \
+# $(test_valaflags)
+#rygel_http_item_uri_test_CFLAGS = \
+# $(test_cflags)
+#rygel_http_item_uri_test_LDADD = \
+# $(test_libs)
+#
+#rygel_http_response_test_SOURCES = rygel-http-response-test.vala \
+# rygel-http-response.vala \
+# rygel-state-machine_http-response.vala \
+# rygel-data-source_http-response.vala \
+# rygel-data-sink_http-response.vala
+#rygel_http_response_test_VALAFLAGS = \
+# $(test_valaflags)
+#rygel_http_response_test_CFLAGS = \
+# $(test_cflags)
+#rygel_http_response_test_LDADD = \
+# $(test_libs)
+#
+#rygel_http_byte_seek_test_SOURCES = rygel-http-byte-seek-test.vala \
+# rygel-http-byte-seek.vala \
+# rygel-http-seek.vala
+#rygel_http_byte_seek_test_VALAFLAGS = \
+# $(test_valaflags)
+#rygel_http_byte_seek_test_CFLAGS = \
+# $(test_cflags)
+#rygel_http_byte_seek_test_LDADD = $(test_libs)
+#
+#rygel_http_time_seek_test_SOURCES = rygel-http-time-seek-test.vala \
+# rygel-http-time-seek.vala \
+# rygel-http-seek_time-seek.vala
+#rygel_http_time_seek_test_VALAFLAGS = \
+# $(test_valaflags)
+#rygel_http_time_seek_test_CFLAGS = \
+# $(test_cflags)
+#rygel_http_time_seek_test_LDADD = \
+# $(test_libs)
+#
+#rygel_http_get_test_SOURCES = rygel-http-get-test.vala \
+# rygel-http-get.vala \
+# rygel-http-request_http-get.vala \
+# rygel-http-item-uri_http-get.vala \
+# rygel-state-machine_http-get.vala \
+# rygel-http-time-seek_http-get.vala \
+# rygel-http-byte-seek_http-get.vala \
+# rygel-http-seek_http-get.vala
+#rygel_http_get_test_VALAFLAGS = \
+# $(test_valaflags)
+#rygel_http_get_test_CFLAGS = \
+# $(test_cflags)
+#rygel_http_get_test_LDADD = \
+# $(test_libs)
+#
+#rygel_http_post_test_SOURCES = rygel-http-post-test.vala \
+# rygel-http-post.vala \
+# rygel-http-request_http-post.vala \
+# rygel-http-item-uri_http-post.vala \
+# rygel-state-machine_http-post.vala
+#rygel_http_post_test_VALAFLAGS = $(test_valaflags) \
+# --pkg gupnp-av-1.0
+#rygel_http_post_test_CFLAGS = \
+# $(test_cflags)
+#rygel_http_post_test_LDADD = \
+# $(test_libs)
+#
+#rygel_searchable_container_test_SOURCES = \
+# rygel-searchable-container.vala \
+# rygel-searchable-container-test.vala
+#rygel_searchable_container_test_VALAFLAGS = \
+# $(test_valaflags) \
+# --pkg gupnp-av-1.0
+#rygel_searchable_container_test_CFLAGS = \
+# $(test_cflags)
+#rygel_searchable_container_test_LDADD = \
+# $(test_libs)
+#
+#rygel_object_creator_test_SOURCES = rygel-object-creator-test.vala \
+# rygel-object-creator.vala \
+# rygel-data-source.vala \
+# rygel-dlna-profile.vala \
+# rygel-http-seek_object-creator.vala \
+# rygel-state-machine_object-creator.vala \
+# rygel-relational-expression.vala \
+# rygel-logical-expression.vala \
+# rygel-search-expression.vala \
+# rygel-search-criteria-parser.vala \
+# rygel-serializer_object-creator.vala \
+# rygel-m3u-playlist_object-creator.vala
+#rygel_object_creator_test_VALAFLAGS = \
+# $(test_valaflags) \
+# --pkg uuid
+#rygel_object_creator_test_CFLAGS = \
+# $(test_cflags)
+#rygel_object_creator_test_LDADD = \
+# $(test_libs)
+#
rygel_user_config_test_SOURCES = rygel-configuration.vala \
rygel-user-config.vala \
rygel-user-config-test.vala
@@ -167,18 +168,18 @@ rygel_regression_CFLAGS = \
rygel_regression_LDADD = \
$(test_server_libs)
-rygel_media_engine_test_SOURCES = \
- rygel-media-engine-test.vala
-rygel_media_engine_test_VALAFLAGS = \
- $(test_server_valaflags)
-rygel_media_engine_test_CFLAGS = \
- $(test_server_cflags) \
- -DTEST_DATA_FOLDER='"$(abs_srcdir)/data"' \
- -DTEST_ENGINE_PATH='"$(abs_top_builddir)/src/media-engines"' \
- -DBUILT_ENGINES='"@BUILT_ENGINES@"'
-rygel_media_engine_test_LDADD = \
- $(test_server_libs)
-
+#rygel_media_engine_test_SOURCES = \
+# rygel-media-engine-test.vala
+#rygel_media_engine_test_VALAFLAGS = \
+# $(test_server_valaflags)
+#rygel_media_engine_test_CFLAGS = \
+# $(test_server_cflags) \
+# -DTEST_DATA_FOLDER='"$(abs_srcdir)/data"' \
+# -DTEST_ENGINE_PATH='"$(abs_top_builddir)/src/media-engines"' \
+# -DBUILT_ENGINES='"@BUILT_ENGINES@"'
+#rygel_media_engine_test_LDADD = \
+# $(test_server_libs)
+#
if HAVE_GSTREAMER
check_PROGRAMS += \
rygel-playbin-renderer-test \
@@ -217,29 +218,29 @@ rygel_environment_test_LDADD = \
endif
if BUILD_MEDIA_EXPORT_PLUGIN
-check_PROGRAMS += plugins/media-export/regression
-
-plugins_media_export_regression_SOURCES = \
- $(top_srcdir)/src/librygel-core/rygel-core-2.6.vapi \
- $(top_srcdir)/src/librygel-server/rygel-server-2.6.vapi \
- $(top_srcdir)/src/plugins/media-export/rygel-media-export.vapi \
- plugins/media-export/regression.vala
-plugins_media_export_regression_CFLAGS = \
- $(test_cflags) \
- $(COLLATION_CFLAGS) \
- $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_CFLAGS) \
- $(RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS) \
- -I$(top_srcdir)/src/plugins/media-export
-plugins_media_export_regression_LDADD = \
- $(test_libs) \
- $(COLLATION_LIBS) \
- $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS) \
- $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \
- $(top_builddir)/src/plugins/media-export/librygel-media-export.la
-plugins_media_export_regression_VALAFLAGS = \
- $(test_valaflags) \
- --enable-experimental \
- $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_VALAFLAGS)
+#check_PROGRAMS += plugins/media-export/regression
+#
+#plugins_media_export_regression_SOURCES = \
+# $(top_srcdir)/src/librygel-core/rygel-core-2.6.vapi \
+# $(top_srcdir)/src/librygel-server/rygel-server-2.6.vapi \
+# $(top_srcdir)/src/plugins/media-export/rygel-media-export.vapi \
+# plugins/media-export/regression.vala
+#plugins_media_export_regression_CFLAGS = \
+# $(test_cflags) \
+# $(COLLATION_CFLAGS) \
+# $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_CFLAGS) \
+# $(RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS) \
+# -I$(top_srcdir)/src/plugins/media-export
+#plugins_media_export_regression_LDADD = \
+# $(test_libs) \
+# $(COLLATION_LIBS) \
+# $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_LIBS) \
+# $(RYGEL_COMMON_LIBRYGEL_SERVER_LIBS) \
+# $(top_builddir)/src/plugins/media-export/librygel-media-export.la
+#plugins_media_export_regression_VALAFLAGS = \
+# $(test_valaflags) \
+# --enable-experimental \
+# $(RYGEL_PLUGIN_MEDIA_EXPORT_DEPS_VALAFLAGS)
endif
diff --git a/tests/rygel-user-config-test.vala b/tests/rygel-user-config-test.vala
index c2cd716..d8fa352 100644
--- a/tests/rygel-user-config-test.vala
+++ b/tests/rygel-user-config-test.vala
@@ -68,7 +68,6 @@ public class Rygel.UserConfigTest : GLib.Object {
private class Settings : GLib.Object {
public string? general_title;
public bool? general_enabled;
- public bool? general_upnp_enabled;
public string? general_iface;
public int? general_port;
public string? foo_title;
@@ -77,7 +76,6 @@ public class Rygel.UserConfigTest : GLib.Object {
private void initialize (string? general_title = null,
bool? general_enabled = null,
- bool? general_upnp_enabled = null,
string? general_iface = null,
int? general_port = null,
string? foo_title = null,
@@ -85,7 +83,6 @@ public class Rygel.UserConfigTest : GLib.Object {
bool? foo_setting = null) {
this.general_title = general_title;
this.general_enabled = general_enabled;
- this.general_upnp_enabled = general_upnp_enabled;
this.general_iface = general_iface;
this.general_port = general_port;
this.foo_title = foo_title;
@@ -95,7 +92,6 @@ public class Rygel.UserConfigTest : GLib.Object {
public Settings (string? general_title = null,
bool? general_enabled = null,
- bool? general_upnp_enabled = null,
string? general_iface = null,
int? general_port = null,
string? foo_title = null,
@@ -103,7 +99,6 @@ public class Rygel.UserConfigTest : GLib.Object {
bool? foo_setting = null) {
this.initialize (general_title,
general_enabled,
- general_upnp_enabled,
general_iface,
general_port,
foo_title,
@@ -114,7 +109,6 @@ public class Rygel.UserConfigTest : GLib.Object {
public Settings.default () {
this.initialize ("General",
true,
- true,
"eth0",
42,
"Foo",
@@ -303,11 +297,6 @@ public class Rygel.UserConfigTest : GLib.Object {
if (settings.general_enabled != null) {
key_file.set_boolean (GENERAL, "enabled", settings.general_enabled);
}
- if (settings.general_upnp_enabled != null) {
- key_file.set_boolean (GENERAL,
- "upnp-enabled",
- settings.general_upnp_enabled);
- }
if (settings.general_iface != null) {
key_file.set_string (GENERAL, "interface", settings.general_iface);
}
@@ -533,7 +522,6 @@ public class Rygel.UserConfigTest : GLib.Object {
"lots of changes";
var config = new ConfigSet ();
- config.gee.add (ConfigurationEntry.UPNP_ENABLED);
config.gee.add (ConfigurationEntry.INTERFACE);
config.gee.add (ConfigurationEntry.PORT);
@@ -555,7 +543,6 @@ public class Rygel.UserConfigTest : GLib.Object {
(this,
new Settings ("Changed!",
false,
- false,
"Changed!",
13,
"Changed!",
@@ -605,7 +592,6 @@ public class Rygel.UserConfigTest : GLib.Object {
(this,
new Settings (null,
false,
- false,
null,
13,
"Changed!",
@@ -626,7 +612,6 @@ public class Rygel.UserConfigTest : GLib.Object {
"settings";
var config = new ConfigSet ();
- config.gee.add (ConfigurationEntry.UPNP_ENABLED);
config.gee.add (ConfigurationEntry.PORT);
var section = new SectionMap ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
