+ gnome-desktop-testing-2018.1-1

Update to 2018.1

.gitignore

@@ -1,3 +1,4 @@
 /gnome-desktop-testing-2013.1.tar.xz
 /gnome-desktop-testing-2014.1.tar.xz
 /gnome-desktop-testing-2016.1.tar.xz
+/gnome-desktop-testing-v2018.1.tar.gz

0001-Don-t-crash-on-unknown-command-line-options.patch

@@ -0,0 +1,41 @@
+From 6f1a480b8d1a4db83cd5ce8bd3df23dae001dbab Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 28 Nov 2019 14:48:16 +0100
+Subject: [PATCH] Don't crash on unknown command-line options
+
+gnome-desktop-testing-runner --foo
+made it crash because it tried to access a number of arrays which
+weren't allocated at option parsing time. Simply allocate them so we
+access empty arrays instead of dereference a NULL pointer.
+---
+ src/gnome-desktop-testing-runner.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/gnome-desktop-testing-runner.c b/src/gnome-desktop-testing-runner.c
+index 7ddaaaf..7987936 100644
+--- a/src/gnome-desktop-testing-runner.c
++++ b/src/gnome-desktop-testing-runner.c
+@@ -855,6 +855,9 @@ main (int argc, char **argv)
+ 
+   memset (&appstruct, 0, sizeof (appstruct));
+   app = &appstruct;
++  app->pending_tests = g_hash_table_new (NULL, NULL);
++  app->tests = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
++  app->failed_test_msgs = g_ptr_array_new_with_free_func ((GDestroyNotify)g_free);
+ 
+   /* avoid gvfs (http://bugzilla.gnome.org/show_bug.cgi?id=526454) */
+   g_setenv ("GIO_USE_VFS", "local", TRUE);
+@@ -889,10 +892,6 @@ main (int argc, char **argv)
+   else
+     app->parallel = opt_parallel;
+ 
+-  app->pending_tests = g_hash_table_new (NULL, NULL);
+-  app->tests = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
+-  app->failed_test_msgs = g_ptr_array_new_with_free_func ((GDestroyNotify)g_free);
+-
+   if (opt_dirs)
+     datadirs_iter = (const char *const*) opt_dirs;
+   else
+-- 
+2.23.0
+

gnome-desktop-testing.spec

@@ -1,15 +1,19 @@
 Name:           gnome-desktop-testing
-Version:        2016.1
-Release:        10%{?dist}
+Version:        2018.1
+Release:        1%{?dist}
 Summary:        GNOME test runner for installed tests
 
 License:        LGPLv2+
 URL:            https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop-testing/%{version}/%{name}-%{version}.tar.xz
+Source0:        https://gitlab.gnome.org/GNOME/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
 
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libgsystem)
+BuildRequires:  git automake autoconf libtool
+
+# https://gitlab.gnome.org/GNOME/gnome-desktop-testing/merge_requests/1
+Patch0: 0001-Don-t-crash-on-unknown-command-line-options.patch
 
 %description
 gnome-desktop-testing-runner is a basic runner for tests that are
@@ -17,12 +21,11 @@ installed in /usr/share/installed-tests.  For more information, see
 "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"
 
 %prep
-%autosetup
+%autosetup -S git_am -n %{name}-v%{version}
+NOCONFIGURE=1 ./autogen.sh
 
 %build
-(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--with-systemd-journal; fi;
- %configure $CONFIGFLAGS
-)
+%configure --with-systemd-journal
 make %{?_smp_mflags}
 
 %install
@@ -34,6 +37,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_bindir}/ginsttest-runner
 
 %changelog
+* Thu Nov 28 2019 Bastien Nocera <bnocera@redhat.com> - 2018.1-1
++ gnome-desktop-testing-2018.1-1
+- Update to 2018.1
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-840a752dc0890b437e2ff5f005678b90  gnome-desktop-testing-2016.1.tar.xz
+SHA512 (gnome-desktop-testing-v2018.1.tar.gz) = f5ff39b07120673983f723e13b2452b951cdecb6e88e4d351c528d9bfc16e19813ec4154bfefb430d6f91d2ffd531329519048e3bb150809ccecc952e735d98b