Merge branch 'f40' into c10s
This commit is contained in:
Takao Fujiwara
commit
f7d9f9067f
4
.gitignore
vendored
4
.gitignore
vendored
@ -0,0 +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
|
||||||
41
0001-Don-t-crash-on-unknown-command-line-options.patch
Normal file
41
0001-Don-t-crash-on-unknown-command-line-options.patch
Normal file
@ -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
|
||||||
|
|
||||||
125
gnome-desktop-testing.spec
Normal file
125
gnome-desktop-testing.spec
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
Name: gnome-desktop-testing
|
||||||
|
Version: 2018.1
|
||||||
|
Release: 12%{?dist}
|
||||||
|
Summary: GNOME test runner for installed tests
|
||||||
|
|
||||||
|
License: LGPLv2+
|
||||||
|
URL: https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests
|
||||||
|
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
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
|
# 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
|
||||||
|
installed in /usr/share/installed-tests. For more information, see
|
||||||
|
"https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -S git_am -n %{name}-v%{version}
|
||||||
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure --with-systemd-journal
|
||||||
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
%install
|
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%files
|
||||||
|
%doc COPYING README
|
||||||
|
%{_bindir}/gnome-desktop-testing-runner
|
||||||
|
%{_bindir}/ginsttest-runner
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-4
|
||||||
|
- Second attempt - Rebuilt for
|
||||||
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2018.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Aug 07 2017 Colin Walters <walters@verbum.org> - 2016.1-6
|
||||||
|
- Fix systemd BR
|
||||||
|
|
||||||
|
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2016.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Mar 31 2016 Colin Walters <walters@redhat.com> - 2016.1-2
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2014.1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2014.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 30 2014 Colin Walters <walters@verbum.org> - 2014.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2013.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 21 2013 Matthias Clasen <mclasen@redhat.com> - 2013.1-1
|
||||||
|
- Initial packaging (#976919)
|
||||||
Loading…
Reference in New Issue
Block a user