Hello community, here is the log from the commit of package glib-networking for openSUSE:Factory checked in at 2013-06-29 19:40:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib-networking (Old) and /work/SRC/openSUSE:Factory/.glib-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib-networking" Changes: -------- --- /work/SRC/openSUSE:Factory/glib-networking/glib-networking.changes 2013-06-05 11:52:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glib-networking.new/glib-networking.changes 2013-06-29 19:40:11.000000000 +0200 @@ -1,0 +2,15 @@ +Tue May 28 19:52:00 UTC 2013 - [email protected] + +- Update to version 2.37.2: + + proxy/gnome: Improve session-type detection to include + gnome-classic and anything else starting with "gnome" + (bgo#700607). + + proxy/libproxy: make SOCKS work when using the async API + (bgo#699359). + + proxy/tests: make the libproxy test program use the just-built + plugin rather than the installed one (bgo#700286). + + proxy/tests: fix to not error out if neither proxy module is + built (bgo#700628). + + tls/tests: fix a sporadic crash. + +------------------------------------------------------------------- Old: ---- glib-networking-2.37.1.tar.xz New: ---- glib-networking-2.37.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib-networking.spec ++++++ --- /var/tmp/diff_new_pack.Fv6pKK/_old 2013-06-29 19:40:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Fv6pKK/_new 2013-06-29 19:40:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: glib-networking -Version: 2.37.1 +Version: 2.37.2 Release: 0 Summary: Network-related GIO modules for glib License: LGPL-2.1+ ++++++ glib-networking-2.37.1.tar.xz -> glib-networking-2.37.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/Makefile.decl new/glib-networking-2.37.2/Makefile.decl --- old/glib-networking-2.37.1/Makefile.decl 2011-12-30 15:14:01.000000000 +0100 +++ new/glib-networking-2.37.2/Makefile.decl 2013-05-28 14:44:30.000000000 +0200 @@ -33,13 +33,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -47,7 +47,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/Makefile.in new/glib-networking-2.37.2/Makefile.in --- old/glib-networking-2.37.1/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -859,13 +859,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -873,7 +873,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/NEWS new/glib-networking-2.37.2/NEWS --- old/glib-networking-2.37.1/NEWS 2013-04-30 22:26:59.000000000 +0200 +++ new/glib-networking-2.37.2/NEWS 2013-05-28 18:48:53.000000000 +0200 @@ -1,3 +1,20 @@ +2.37.2 +====== + * proxy/gnome: Improve session-type detection to include + gnome-classic and anything else starting with "gnome" (#700607, + Giovanni Campagna) + + * proxy/libproxy: make SOCKS work when using the async API (#699359, + Dan) + + * proxy/tests: make the libproxy test program use the just-built + plugin rather than the installed one. Oops (#700286, Iain Lane) + + * proxy/tests: fix to not error out if neither proxy module is built + (#700628, Dan) + + * tls/tests: fix a sporadic crash (Dan) + 2.37.1 ====== * gnutls: Fixed a bug that could cause hangs and/or bursts of CPU diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/aclocal.m4 new/glib-networking-2.37.2/aclocal.m4 --- old/glib-networking-2.37.1/aclocal.m4 2013-04-30 22:34:54.000000000 +0200 +++ new/glib-networking-2.37.2/aclocal.m4 2013-05-28 18:52:29.000000000 +0200 @@ -1872,7 +1872,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/configure new/glib-networking-2.37.2/configure --- old/glib-networking-2.37.1/configure 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/configure 2013-05-28 18:52:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for glib-networking 2.37.1. +# Generated by GNU Autoconf 2.69 for glib-networking 2.37.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='glib-networking' PACKAGE_TARNAME='glib-networking' -PACKAGE_VERSION='2.37.1' -PACKAGE_STRING='glib-networking 2.37.1' +PACKAGE_VERSION='2.37.2' +PACKAGE_STRING='glib-networking 2.37.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network' PACKAGE_URL='' @@ -1412,7 +1412,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures glib-networking 2.37.1 to adapt to many kinds of systems. +\`configure' configures glib-networking 2.37.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of glib-networking 2.37.1:";; + short | recursive ) echo "Configuration of glib-networking 2.37.2:";; esac cat <<\_ACEOF @@ -1622,7 +1622,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -glib-networking configure 2.37.1 +glib-networking configure 2.37.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1991,7 +1991,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by glib-networking $as_me 2.37.1, which was +It was created by glib-networking $as_me 2.37.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2820,7 +2820,7 @@ # Define the identity of the package. PACKAGE='glib-networking' - VERSION='2.37.1' + VERSION='2.37.2' cat >>confdefs.h <<_ACEOF @@ -15309,7 +15309,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by glib-networking $as_me 2.37.1, which was +This file was extended by glib-networking $as_me 2.37.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15375,7 +15375,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -glib-networking config.status 2.37.1 +glib-networking config.status 2.37.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/configure.ac new/glib-networking-2.37.2/configure.ac --- old/glib-networking-2.37.1/configure.ac 2013-04-30 22:24:31.000000000 +0200 +++ new/glib-networking-2.37.2/configure.ac 2013-05-28 18:44:55.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([glib-networking],[2.37.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) +AC_INIT([glib-networking],[2.37.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/gnome/Makefile.in new/glib-networking-2.37.2/proxy/gnome/Makefile.in --- old/glib-networking-2.37.1/proxy/gnome/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/proxy/gnome/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -686,13 +686,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -700,7 +700,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/gnome/gproxyresolvergnome.c new/glib-networking-2.37.2/proxy/gnome/gproxyresolvergnome.c --- old/glib-networking-2.37.1/proxy/gnome/gproxyresolvergnome.c 2013-04-30 15:29:57.000000000 +0200 +++ new/glib-networking-2.37.2/proxy/gnome/gproxyresolvergnome.c 2013-05-28 14:47:43.000000000 +0200 @@ -313,8 +313,14 @@ static gboolean g_proxy_resolver_gnome_is_supported (GProxyResolver *object) { - return !g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "gnome") || - !g_strcmp0 (g_getenv ("DESKTOP_SESSION"), "ubuntu"); + const char *session; + + session = g_getenv ("DESKTOP_SESSION"); + if (session == NULL) + return FALSE; + + return g_str_has_prefix (session, "gnome") || + strcmp (session, "ubuntu") == 0; } static inline gchar ** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/libproxy/Makefile.in new/glib-networking-2.37.2/proxy/libproxy/Makefile.in --- old/glib-networking-2.37.1/proxy/libproxy/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/proxy/libproxy/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -837,13 +837,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -851,7 +851,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/libproxy/glibproxyresolver.c new/glib-networking-2.37.2/proxy/libproxy/glibproxyresolver.c --- old/glib-networking-2.37.1/proxy/libproxy/glibproxyresolver.c 2013-02-21 12:04:41.000000000 +0100 +++ new/glib-networking-2.37.2/proxy/libproxy/glibproxyresolver.c 2013-05-28 14:44:30.000000000 +0200 @@ -128,29 +128,35 @@ free (proxies); } -static gchar ** -get_libproxy_proxies (GLibProxyResolver *resolver, - const gchar *uri, - GCancellable *cancellable, - GError **error) +static void +get_libproxy_proxies (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) { + GLibProxyResolver *resolver = source_object; + const gchar *uri = task_data; + GError *error = NULL; gchar **proxies; - /* FIXME: this is not really cancellable; to do it right we'd - * need to run this function in a thread pool like GThreadedResolver. - */ - - if (g_cancellable_set_error_if_cancelled (cancellable, error)) - return NULL; + if (g_task_return_error_if_cancelled (task)) + return; proxies = px_proxy_factory_get_proxies (resolver->factory, uri); - if (!proxies) + if (proxies) + { + /* We always copy to be able to translate "socks" entry into + * three entries ("socks5", "socks4a", "socks4"). + */ + g_task_return_pointer (task, copy_proxies (proxies), (GDestroyNotify) g_strfreev); + free_libproxy_proxies (proxies); + } + else { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Proxy resolver internal error.")); + g_task_return_error (task, error); } - - return proxies; } static gchar ** @@ -159,51 +165,22 @@ GCancellable *cancellable, GError **error) { - GLibProxyResolver *resolver; + GLibProxyResolver *resolver = G_LIBPROXY_RESOLVER (iresolver); + GTask *task; gchar **proxies; - g_return_val_if_fail (G_IS_LIBPROXY_RESOLVER (iresolver), NULL); - g_return_val_if_fail (uri != NULL, NULL); - - resolver = G_LIBPROXY_RESOLVER (iresolver); - - proxies = get_libproxy_proxies (resolver, uri, cancellable, error); + task = g_task_new (resolver, cancellable, NULL, NULL); + g_task_set_task_data (task, g_strdup (uri), g_free); + g_task_set_return_on_cancel (task, TRUE); - /* We always copy to be able to translate "socks" entry into - * three entries ("socks5", "socks4a", "socks4"). - */ - if (proxies) - { - gchar **copy; - - copy = copy_proxies (proxies); - free_libproxy_proxies (proxies); - proxies = copy; - } + g_task_run_in_thread_sync (task, get_libproxy_proxies); + proxies = g_task_propagate_pointer (task, error); + g_object_unref (task); return proxies; } static void -_lookup_async (GTask *task, - gpointer object, - gpointer task_data, - GCancellable *cancellable) -{ - GLibProxyResolver *resolver = object; - gchar *uri = task_data; - GError *error = NULL; - gchar **proxies = NULL; - - proxies = get_libproxy_proxies (resolver, uri, cancellable, &error); - - if (error) - g_task_return_error (task, error); - else - g_task_return_pointer (task, proxies, (GDestroyNotify)free_libproxy_proxies); -} - -static void g_libproxy_resolver_lookup_async (GProxyResolver *resolver, const gchar *uri, GCancellable *cancellable, @@ -213,8 +190,9 @@ GTask *task; task = g_task_new (resolver, cancellable, callback, user_data); - g_task_set_task_data (task, g_strdup (uri), (GDestroyNotify) g_free); - g_task_run_in_thread (task, _lookup_async); + g_task_set_task_data (task, g_strdup (uri), g_free); + g_task_set_return_on_cancel (task, TRUE); + g_task_run_in_thread (task, get_libproxy_proxies); g_object_unref (task); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/tests/Makefile.am new/glib-networking-2.37.2/proxy/tests/Makefile.am --- old/glib-networking-2.37.1/proxy/tests/Makefile.am 2011-12-30 15:14:01.000000000 +0100 +++ new/glib-networking-2.37.2/proxy/tests/Makefile.am 2013-05-28 14:44:30.000000000 +0200 @@ -14,3 +14,9 @@ if HAVE_GNOME_PROXY TEST_PROGS += gnome endif + +if HAVE_LIBPROXY +TEST_PROGS += libproxy +endif + +EXTRA_DIST += common.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/tests/Makefile.in new/glib-networking-2.37.2/proxy/tests/Makefile.in --- old/glib-networking-2.37.1/proxy/tests/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/proxy/tests/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -54,8 +54,9 @@ host_triplet = @host@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp -noinst_PROGRAMS = $(am__EXEEXT_2) +noinst_PROGRAMS = $(am__EXEEXT_3) @HAVE_GNOME_PROXY_TRUE@am__append_1 = gnome +@HAVE_LIBPROXY_TRUE@am__append_2 = libproxy subdir = proxy/tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ @@ -69,7 +70,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @HAVE_GNOME_PROXY_TRUE@am__EXEEXT_1 = gnome$(EXEEXT) -am__EXEEXT_2 = $(am__EXEEXT_1) +@HAVE_LIBPROXY_TRUE@am__EXEEXT_2 = libproxy$(EXEEXT) +am__EXEEXT_3 = $(am__EXEEXT_1) $(am__EXEEXT_2) PROGRAMS = $(noinst_PROGRAMS) gnome_SOURCES = gnome.c gnome_OBJECTS = gnome.$(OBJEXT) @@ -80,6 +82,10 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +libproxy_SOURCES = libproxy.c +libproxy_OBJECTS = libproxy.$(OBJEXT) +libproxy_LDADD = $(LDADD) +libproxy_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -114,8 +120,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = gnome.c -DIST_SOURCES = gnome.c +SOURCES = gnome.c libproxy.c +DIST_SOURCES = gnome.c libproxy.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -302,8 +308,8 @@ GTESTER_REPORT = gtester-report # for the GLIB package # initialize variables for unconditional += appending -EXTRA_DIST = -TEST_PROGS = $(am__append_1) +EXTRA_DIST = common.c +TEST_PROGS = $(am__append_1) $(am__append_2) LDADD = \ $(GLIB_LIBS) @@ -354,6 +360,9 @@ gnome$(EXEEXT): $(gnome_OBJECTS) $(gnome_DEPENDENCIES) $(EXTRA_gnome_DEPENDENCIES) @rm -f gnome$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gnome_OBJECTS) $(gnome_LDADD) $(LIBS) +libproxy$(EXEEXT): $(libproxy_OBJECTS) $(libproxy_DEPENDENCIES) $(EXTRA_libproxy_DEPENDENCIES) + @rm -f libproxy$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(libproxy_OBJECTS) $(libproxy_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -362,6 +371,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libproxy.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -620,13 +630,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -634,7 +644,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/tests/common.c new/glib-networking-2.37.2/proxy/tests/common.c --- old/glib-networking-2.37.1/proxy/tests/common.c 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.37.2/proxy/tests/common.c 2013-05-28 14:44:30.000000000 +0200 @@ -0,0 +1,192 @@ +/* GProxyResolver tests + * + * Copyright 2011-2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <gio/gio.h> + +static void +test_proxy_uri_common (void) +{ + GProxyResolver *resolver; + gchar **proxies; + GError *error = NULL; + + resolver = g_proxy_resolver_get_default (); + + proxies = g_proxy_resolver_lookup (resolver, "http://one.example.com/";, + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 1); + g_assert_cmpstr (proxies[0], ==, "http://proxy.example.com:8080";); + g_strfreev (proxies); + + proxies = g_proxy_resolver_lookup (resolver, "HTTPS://uppercase.example.com/", + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 1); + g_assert_cmpstr (proxies[0], ==, "http://proxy-s.example.com:7070";); + g_strfreev (proxies); + + /* Unknown protocols will use the http proxy by default in this configuration. */ + proxies = g_proxy_resolver_lookup (resolver, "htt://missing-letter.example.com/", + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 1); + g_assert_cmpstr (proxies[0], ==, "http://proxy.example.com:8080";); + g_strfreev (proxies); + + proxies = g_proxy_resolver_lookup (resolver, "ftps://extra-letter.example.com/", + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 1); + g_assert_cmpstr (proxies[0], ==, "http://proxy.example.com:8080";); + g_strfreev (proxies); + + proxies = g_proxy_resolver_lookup (resolver, "ftp://five.example.com/";, + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 1); + g_assert_cmpstr (proxies[0], ==, "ftp://proxy-f.example.com:6060";); + g_strfreev (proxies); +} + +static void +test_proxy_socks_common (void) +{ + GProxyResolver *resolver; + gchar **proxies; + GError *error = NULL; + + resolver = g_proxy_resolver_get_default (); + + proxies = g_proxy_resolver_lookup (resolver, "http://one.example.com/";, + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 3); + g_assert_cmpstr (proxies[0], ==, "socks5://proxy.example.com:1234"); + g_assert_cmpstr (proxies[1], ==, "socks4a://proxy.example.com:1234"); + g_assert_cmpstr (proxies[2], ==, "socks4://proxy.example.com:1234"); + g_strfreev (proxies); + + proxies = g_proxy_resolver_lookup (resolver, "wednesday://two.example.com/", + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 3); + g_assert_cmpstr (proxies[0], ==, "socks5://proxy.example.com:1234"); + g_assert_cmpstr (proxies[1], ==, "socks4a://proxy.example.com:1234"); + g_assert_cmpstr (proxies[2], ==, "socks4://proxy.example.com:1234"); + g_strfreev (proxies); + + proxies = g_proxy_resolver_lookup (resolver, "http://127.0.0.1/";, + NULL, &error); + g_assert_no_error (error); + g_assert_cmpint (g_strv_length (proxies), ==, 1); + g_assert_cmpstr (proxies[0], ==, "direct://"); + g_strfreev (proxies); +} + +static const char *ignore_hosts[] = { + ".bbb.xx", + "*.ccc.xx", + "ddd.xx", + "*.eee.xx:8000", + "127.0.0.0/24", + "10.0.0.1:8000", + "::1", + "fe80::/10", + NULL +}; +static const int n_ignore_hosts = G_N_ELEMENTS (ignore_hosts) - 1; + +static const struct { + const char *uri; + const char *proxy; + gboolean libproxy_fails; +} ignore_tests[] = { + { "http://aaa.xx/";, "http://localhost:8080"; }, + { "http://aaa.xx:8000/";, "http://localhost:8080"; }, + { "http://www.aaa.xx/";, "http://localhost:8080"; }, + { "http://www.aaa.xx:8000/";, "http://localhost:8080"; }, + { "https://aaa.xx/";, "http://localhost:8080"; }, + { "http://bbb.xx/";, "direct://", TRUE }, + { "http://www.bbb.xx/";, "direct://" }, + { "http://bbb.xx:8000/";, "direct://", TRUE }, + { "http://www.bbb.xx:8000/";, "direct://" }, + { "https://bbb.xx/";, "direct://", TRUE }, + { "http://nobbb.xx/";, "http://localhost:8080"; }, + { "http://www.nobbb.xx/";, "http://localhost:8080"; }, + { "http://nobbb.xx:8000/";, "http://localhost:8080"; }, + { "http://www.nobbb.xx:8000/";, "http://localhost:8080"; }, + { "https://nobbb.xx/";, "http://localhost:8080"; }, + { "http://ccc.xx/";, "direct://", TRUE }, + { "http://www.ccc.xx/";, "direct://" }, + { "http://ccc.xx:8000/";, "direct://", TRUE }, + { "http://www.ccc.xx:8000/";, "direct://" }, + { "https://ccc.xx/";, "direct://", TRUE }, + { "http://ddd.xx/";, "direct://" }, + { "http://ddd.xx:8000/";, "direct://" }, + { "http://www.ddd.xx/";, "direct://", TRUE }, + { "http://www.ddd.xx:8000/";, "direct://", TRUE }, + { "https://ddd.xx/";, "direct://" }, + { "http://eee.xx/";, "http://localhost:8080";, TRUE }, + { "http://eee.xx:8000/";, "direct://", TRUE }, + { "http://www.eee.xx/";, "http://localhost:8080"; }, + { "http://www.eee.xx:8000/";, "direct://" }, + { "https://eee.xx/";, "http://localhost:8080";, TRUE }, + { "http://1.2.3.4/";, "http://localhost:8080"; }, + { "http://127.0.0.1/";, "direct://" }, + { "http://127.0.0.2/";, "direct://" }, + { "http://127.0.0.255/";, "direct://" }, + { "http://127.0.1.0/";, "http://localhost:8080"; }, + { "http://10.0.0.1/";, "http://localhost:8080"; }, + { "http://10.0.0.1:8000/";, "direct://" }, + { "http://[::1]/";, "direct://", TRUE }, + { "http://[::1]:80/";, "direct://", TRUE }, + { "http://[::1:1]/";, "http://localhost:8080"; }, + { "http://[::1:1]:80/";, "http://localhost:8080"; }, + { "http://[fe80::1]/";, "direct://", TRUE }, + { "http://[fe80::1]:80/";, "direct://", TRUE }, + { "http://[fec0::1]/";, "http://localhost:8080"; }, + { "http://[fec0::1]:80/";, "http://localhost:8080"; } +}; +static const int n_ignore_tests = G_N_ELEMENTS (ignore_tests); + +static void +test_proxy_ignore_common (gboolean is_libproxy) +{ + GProxyResolver *resolver; + GError *error = NULL; + char **proxies; + int i; + + resolver = g_proxy_resolver_get_default (); + + for (i = 0; i < n_ignore_tests; i++) + { + proxies = g_proxy_resolver_lookup (resolver, ignore_tests[i].uri, + NULL, &error); + g_assert_no_error (error); + + if (is_libproxy && ignore_tests[i].libproxy_fails) + g_assert_cmpstr (proxies[0], ==, "http://localhost:8080";); + else + g_assert_cmpstr (proxies[0], ==, ignore_tests[i].proxy); + + g_strfreev (proxies); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/tests/gnome.c new/glib-networking-2.37.2/proxy/tests/gnome.c --- old/glib-networking-2.37.1/proxy/tests/gnome.c 2013-02-21 13:00:06.000000000 +0100 +++ new/glib-networking-2.37.2/proxy/tests/gnome.c 2013-05-28 14:44:30.000000000 +0200 @@ -20,6 +20,8 @@ #include <gio/gio.h> #include <gdesktop-enums.h> +#include "common.c" + #define GNOME_PROXY_SETTINGS_SCHEMA "org.gnome.system.proxy" #define GNOME_PROXY_MODE_KEY "mode" #define GNOME_PROXY_AUTOCONFIG_URL_KEY "autoconfig-url" @@ -83,9 +85,6 @@ gconstpointer user_data) { GSettings *settings, *child; - GProxyResolver *resolver; - gchar **proxies; - GError *error = NULL; settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL); @@ -108,45 +107,7 @@ g_object_unref (settings); - resolver = g_proxy_resolver_get_default (); - - proxies = g_proxy_resolver_lookup (resolver, "http://one.example.com/";, - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 1); - g_assert_cmpstr (proxies[0], ==, "http://proxy.example.com:8080";); - g_strfreev (proxies); - - proxies = g_proxy_resolver_lookup (resolver, "HTTPS://uppercase.example.com/", - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 1); - g_assert_cmpstr (proxies[0], ==, "http://proxy-s.example.com:7070";); - g_strfreev (proxies); - - /* Because we set use_same_proxy = TRUE, unknown protocols will use - * the http proxy by default. - */ - proxies = g_proxy_resolver_lookup (resolver, "htt://missing-letter.example.com/", - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 1); - g_assert_cmpstr (proxies[0], ==, "http://proxy.example.com:8080";); - g_strfreev (proxies); - - proxies = g_proxy_resolver_lookup (resolver, "ftps://extra-letter.example.com/", - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 1); - g_assert_cmpstr (proxies[0], ==, "http://proxy.example.com:8080";); - g_strfreev (proxies); - - proxies = g_proxy_resolver_lookup (resolver, "ftp://five.example.com/";, - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 1); - g_assert_cmpstr (proxies[0], ==, "ftp://proxy-f.example.com:6060";); - g_strfreev (proxies); + test_proxy_uri_common (); } static void @@ -154,10 +115,7 @@ gconstpointer user_data) { GSettings *settings, *child; - GProxyResolver *resolver; const gchar *ignore_hosts[2] = { "127.0.0.1", NULL }; - gchar **proxies; - GError *error = NULL; settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL); @@ -170,107 +128,14 @@ g_object_unref (child); g_object_unref (settings); - resolver = g_proxy_resolver_get_default (); - - proxies = g_proxy_resolver_lookup (resolver, "http://one.example.com/";, - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 3); - g_assert_cmpstr (proxies[0], ==, "socks5://proxy.example.com:1234"); - g_assert_cmpstr (proxies[1], ==, "socks4a://proxy.example.com:1234"); - g_assert_cmpstr (proxies[2], ==, "socks4://proxy.example.com:1234"); - g_strfreev (proxies); - - proxies = g_proxy_resolver_lookup (resolver, "wednesday://two.example.com/", - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 3); - g_assert_cmpstr (proxies[0], ==, "socks5://proxy.example.com:1234"); - g_assert_cmpstr (proxies[1], ==, "socks4a://proxy.example.com:1234"); - g_assert_cmpstr (proxies[2], ==, "socks4://proxy.example.com:1234"); - g_strfreev (proxies); - - proxies = g_proxy_resolver_lookup (resolver, "http://127.0.0.1/";, - NULL, &error); - g_assert_no_error (error); - g_assert_cmpint (g_strv_length (proxies), ==, 1); - g_assert_cmpstr (proxies[0], ==, "direct://"); - g_strfreev (proxies); + test_proxy_socks_common (); } -static const char *ignore_hosts[] = { - ".bbb.xx", - "*.ccc.xx", - "ddd.xx", - "*.eee.xx:8000", - "127.0.0.0/24", - "10.0.0.1:8000", - "::1", - "fe80::/10" -}; -static const int n_ignore_hosts = G_N_ELEMENTS (ignore_hosts); - -static const struct { - const char *uri; - const char *proxy; -} ignore_tests[] = { - { "http://aaa.xx/";, "http://localhost:8080"; }, - { "http://aaa.xx:8000/";, "http://localhost:8080"; }, - { "http://www.aaa.xx/";, "http://localhost:8080"; }, - { "http://www.aaa.xx:8000/";, "http://localhost:8080"; }, - { "https://aaa.xx/";, "http://localhost:8080"; }, - { "http://bbb.xx/";, "direct://" }, - { "http://www.bbb.xx/";, "direct://" }, - { "http://bbb.xx:8000/";, "direct://" }, - { "http://www.bbb.xx:8000/";, "direct://" }, - { "https://bbb.xx/";, "direct://" }, - { "http://nobbb.xx/";, "http://localhost:8080"; }, - { "http://www.nobbb.xx/";, "http://localhost:8080"; }, - { "http://nobbb.xx:8000/";, "http://localhost:8080"; }, - { "http://www.nobbb.xx:8000/";, "http://localhost:8080"; }, - { "https://nobbb.xx/";, "http://localhost:8080"; }, - { "http://ccc.xx/";, "direct://" }, - { "http://www.ccc.xx/";, "direct://" }, - { "http://ccc.xx:8000/";, "direct://" }, - { "http://www.ccc.xx:8000/";, "direct://" }, - { "https://ccc.xx/";, "direct://" }, - { "http://ddd.xx/";, "direct://" }, - { "http://ddd.xx:8000/";, "direct://" }, - { "http://www.ddd.xx/";, "direct://" }, - { "http://www.ddd.xx:8000/";, "direct://" }, - { "https://ddd.xx/";, "direct://" }, - { "http://eee.xx/";, "http://localhost:8080"; }, - { "http://eee.xx:8000/";, "direct://" }, - { "http://www.eee.xx/";, "http://localhost:8080"; }, - { "http://www.eee.xx:8000/";, "direct://" }, - { "https://eee.xx/";, "http://localhost:8080"; }, - { "http://1.2.3.4/";, "http://localhost:8080"; }, - { "http://127.0.0.1/";, "direct://" }, - { "http://127.0.0.2/";, "direct://" }, - { "http://127.0.0.255/";, "direct://" }, - { "http://127.0.1.0/";, "http://localhost:8080"; }, - { "http://10.0.0.1/";, "http://localhost:8080"; }, - { "http://10.0.0.1:8000/";, "direct://" }, - { "http://[::1]/";, "direct://" }, - { "http://[::1]:80/";, "direct://" }, - { "http://[::1:1]/";, "http://localhost:8080"; }, - { "http://[::1:1]:80/";, "http://localhost:8080"; }, - { "http://[fe80::1]/";, "direct://" }, - { "http://[fe80::1]:80/";, "direct://" }, - { "http://[fec0::1]/";, "http://localhost:8080"; }, - { "http://[fec0::1]:80/";, "http://localhost:8080"; } -}; -static const int n_ignore_tests = G_N_ELEMENTS (ignore_tests); - static void test_proxy_ignore (gpointer fixture, gconstpointer user_data) { GSettings *settings, *http; - GProxyResolver *resolver; - GError *error = NULL; - char **proxies; - int i; settings = g_settings_new (GNOME_PROXY_SETTINGS_SCHEMA); g_settings_set_enum (settings, GNOME_PROXY_MODE_KEY, G_DESKTOP_PROXY_MODE_MANUAL); @@ -284,17 +149,7 @@ g_object_unref (http); g_object_unref (settings); - resolver = g_proxy_resolver_get_default (); - - for (i = 0; i < n_ignore_tests; i++) - { - proxies = g_proxy_resolver_lookup (resolver, ignore_tests[i].uri, - NULL, &error); - g_assert_no_error (error); - - g_assert_cmpstr (proxies[0], ==, ignore_tests[i].proxy); - g_strfreev (proxies); - } + test_proxy_ignore_common (FALSE); } int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/proxy/tests/libproxy.c new/glib-networking-2.37.2/proxy/tests/libproxy.c --- old/glib-networking-2.37.1/proxy/tests/libproxy.c 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.37.2/proxy/tests/libproxy.c 2013-05-28 14:44:30.000000000 +0200 @@ -0,0 +1,94 @@ +/* GLibProxyResolver tests + * + * Copyright 2011-2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <gio/gio.h> + +#include "common.c" + +static void +reset_proxy_settings (gpointer fixture, + gconstpointer user_data) +{ + g_unsetenv ("http_proxy"); + g_unsetenv ("HTTP_PROXY"); + g_unsetenv ("https_proxy"); + g_unsetenv ("HTTPS_PROXY"); + g_unsetenv ("ftp_proxy"); + g_unsetenv ("FTP_PROXY"); + g_unsetenv ("no_proxy"); + g_unsetenv ("NO_PROXY"); +} + +static void +test_proxy_uri (gpointer fixture, + gconstpointer user_data) +{ + g_setenv ("http_proxy", "http://proxy.example.com:8080";, TRUE); + g_setenv ("https_proxy", "http://proxy-s.example.com:7070";, TRUE); + g_setenv ("ftp_proxy", "ftp://proxy-f.example.com:6060";, TRUE); + + test_proxy_uri_common (); +} + +static void +test_proxy_socks (gpointer fixture, + gconstpointer user_data) +{ + g_setenv ("http_proxy", "socks://proxy.example.com:1234", TRUE); + g_setenv ("no_proxy", "127.0.0.1", TRUE); + + test_proxy_socks_common (); +} + +static void +test_proxy_ignore (gpointer fixture, + gconstpointer user_data) +{ + gchar *no_proxy = g_strjoinv (",", (gchar **) ignore_hosts); + + g_setenv ("http_proxy", "http://localhost:8080";, TRUE); + g_setenv ("no_proxy", no_proxy, TRUE); + g_free (no_proxy); + + test_proxy_ignore_common (TRUE); +} + +int +main (int argc, + char *argv[]) +{ + g_test_init (&argc, &argv, NULL); + + /* Unset variables that would make libproxy try to use gconf or ksettings */ + g_unsetenv ("GNOME_DESKTOP_SESSION_ID"); + g_unsetenv ("DESKTOP_SESSION"); + g_unsetenv ("KDE_FULL_SESSION"); + + /* Use the just-built libproxy module */ + g_setenv ("GIO_EXTRA_MODULES", TOP_BUILDDIR "/proxy/libproxy/.libs", TRUE); + + g_test_add_vtable ("/proxy/libproxy/uri", 0, NULL, + reset_proxy_settings, test_proxy_uri, NULL); + g_test_add_vtable ("/proxy/libproxy/socks", 0, NULL, + reset_proxy_settings, test_proxy_socks, NULL); + g_test_add_vtable ("/proxy/libproxy/ignore", 0, NULL, + reset_proxy_settings, test_proxy_ignore, NULL); + + return g_test_run(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/tls/gnutls/Makefile.in new/glib-networking-2.37.2/tls/gnutls/Makefile.in --- old/glib-networking-2.37.1/tls/gnutls/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/tls/gnutls/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -763,13 +763,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -777,7 +777,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/tls/pkcs11/Makefile.in new/glib-networking-2.37.2/tls/pkcs11/Makefile.in --- old/glib-networking-2.37.1/tls/pkcs11/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/tls/pkcs11/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -636,13 +636,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -650,7 +650,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/tls/tests/Makefile.in new/glib-networking-2.37.2/tls/tests/Makefile.in --- old/glib-networking-2.37.1/tls/tests/Makefile.in 2013-04-30 22:34:55.000000000 +0200 +++ new/glib-networking-2.37.2/tls/tests/Makefile.in 2013-05-28 18:52:30.000000000 +0200 @@ -703,13 +703,13 @@ # test-nonrecursive: run tests only in cwd test-nonrecursive: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} + @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} # test-report: run tests in subdirs and generate report # perf-report: run tests in subdirs with -m perf and generate report # full-report: like test-report: with -m perf and -m slow test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ + @test -z "$(strip ${TEST_PROGS})" || { \ case $@ in \ test-report) test_options="-k";; \ perf-report) test_options="-k -m=perf";; \ @@ -717,7 +717,7 @@ esac ; \ if test -z "$$GTESTER_LOGDIR" ; then \ ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ + elif test -n "$(strip ${TEST_PROGS})" ; then \ ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ fi ; \ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/tls/tests/pkcs11-pin.c new/glib-networking-2.37.2/tls/tests/pkcs11-pin.c --- old/glib-networking-2.37.1/tls/tests/pkcs11-pin.c 2013-02-21 12:04:41.000000000 +0100 +++ new/glib-networking-2.37.2/tls/tests/pkcs11-pin.c 2013-05-28 14:44:30.000000000 +0200 @@ -44,8 +44,8 @@ teardown_pin (TestPin *test, gconstpointer unused) { + g_assert_cmpint (G_OBJECT (test->pin)->ref_count, ==, 1); g_object_unref (test->pin); - g_assert (!G_IS_OBJECT (test->pin)); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-networking-2.37.1/tls/tests/pkcs11-slot.c new/glib-networking-2.37.2/tls/tests/pkcs11-slot.c --- old/glib-networking-2.37.1/tls/tests/pkcs11-slot.c 2013-02-21 12:04:41.000000000 +0100 +++ new/glib-networking-2.37.2/tls/tests/pkcs11-slot.c 2013-05-28 14:44:30.000000000 +0200 @@ -72,11 +72,11 @@ { CK_RV rv; + g_assert_cmpint (G_OBJECT (test->slot)->ref_count, ==, 1); g_object_unref (test->slot); - g_assert (!G_IS_OBJECT (test->slot)); + g_assert_cmpint (G_OBJECT (test->not_present)->ref_count, ==, 1); g_object_unref (test->not_present); - g_assert (!G_IS_OBJECT (test->not_present)); rv = p11_kit_finalize_module (&test->funcs); g_assert (rv == CKR_OK); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
