Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package girara for openSUSE:Factory checked in at 2022-03-01 17:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/girara (Old) and /work/SRC/openSUSE:Factory/.girara.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "girara" Tue Mar 1 17:03:56 2022 rev:14 rq:958254 version:0.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/girara/girara.changes 2021-08-05 20:48:34.283900502 +0200 +++ /work/SRC/openSUSE:Factory/.girara.new.1958/girara.changes 2022-03-01 17:04:45.492352378 +0100 @@ -1,0 +2,7 @@ +Thu Feb 24 23:18:21 UTC 2022 - Bj??rn Lie <[email protected]> + +- update to 0.3.7 + * Various fixes and improvements + * Update translations + +------------------------------------------------------------------- Old: ---- girara-0.3.6.tar.xz New: ---- girara-0.3.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ girara.spec ++++++ --- /var/tmp/diff_new_pack.GseoPe/_old 2022-03-01 17:04:46.020352519 +0100 +++ /var/tmp/diff_new_pack.GseoPe/_new 2022-03-01 17:04:46.024352520 +0100 @@ -1,7 +1,7 @@ # # spec file for package girara # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,16 @@ %define libname libgirara-gtk3 %define so_ver 3 Name: girara -Version: 0.3.6 +Version: 0.3.7 Release: 0 Summary: Graphical user interface library License: Zlib -URL: https://pwmt.org/projects/girara/ -Source0: https://pwmt.org/projects/girara/download/girara-%{version}.tar.xz +URL: https://pwmt.org/projects/girara +Source0: %{url}/download/girara-%{version}.tar.xz BuildRequires: doxygen BuildRequires: gettext BuildRequires: libxml2-tools -BuildRequires: meson +BuildRequires: meson >= 0.56 BuildRequires: pkgconfig BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(glib-2.0) >= 2.50 @@ -91,7 +91,7 @@ %files -n %{libname}-%{so_ver} -f %{libname}-%{so_ver}.lang %license LICENSE -%doc README +%doc README.md %{_libdir}/libgirara-gtk3.so.* %files devel ++++++ girara-0.3.6.tar.xz -> girara-0.3.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/.gitignore new/girara-0.3.7/.gitignore --- old/girara-0.3.6/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/girara-0.3.7/.gitignore 2022-02-13 19:11:34.000000000 +0100 @@ -0,0 +1,9 @@ +*.o +*.do +*.a +*.so* +*.info +*.gcno +*.gcda +*.swp +build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/.gitlab-ci.yml new/girara-0.3.7/.gitlab-ci.yml --- old/girara-0.3.6/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/girara-0.3.7/.gitlab-ci.yml 2022-02-13 19:11:34.000000000 +0100 @@ -0,0 +1,123 @@ +stages: + - build + - test + +# Archlinux +build:archlinux: + tags: + - pwmt + stage: build + image: registry.pwmt.org/pwmt/gitlab-runner-images/archlinux:latest + script: + - mkdir -p build && cd build + - meson .. + - ninja + artifacts: + expire_in: 1 day + paths: + - build + except: + - tags + +test:archlinux: + tags: + - pwmt + stage: test + image: registry.pwmt.org/pwmt/gitlab-runner-images/archlinux:latest + script: + - cd build + - ninja test + dependencies: + - build:archlinux + except: + - tags + +# Debian 10 (Buster) +build:debian-buster: + tags: + - pwmt + stage: build + image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster + script: + - mkdir -p build && cd build + - meson .. + - ninja + artifacts: + expire_in: 1 day + paths: + - build + except: + - tags + +test:debian-buster: + tags: + - pwmt + stage: test + image: registry.pwmt.org/pwmt/gitlab-runner-images/debian:buster + script: + - cd build + - ninja test + dependencies: + - build:debian-buster + except: + - tags + +# Ubuntu 18.04 LTS (Bionic Beaver) +build:ubuntu-bionic: + tags: + - pwmt + stage: build + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic + script: + - mkdir -p build && cd build + - meson .. + - ninja + artifacts: + expire_in: 1 day + paths: + - build + except: + - tags + +test:ubuntu-bionic: + tags: + - pwmt + stage: test + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:bionic + script: + - cd build + - ninja test + dependencies: + - build:ubuntu-bionic + except: + - tags + +# Ubuntu 19.10 (Eoan Ermine) +build:ubuntu-eoan: + tags: + - pwmt + stage: build + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan + script: + - mkdir -p build && cd build + - meson .. + - ninja + artifacts: + expire_in: 1 day + paths: + - build + except: + - tags + +test:ubuntu-eoan: + tags: + - pwmt + stage: test + image: registry.pwmt.org/pwmt/gitlab-runner-images/ubuntu:eoan + script: + - cd build + - ninja test + dependencies: + - build:ubuntu-eoan + except: + - tags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/README new/girara-0.3.7/README --- old/girara-0.3.6/README 2021-07-14 17:17:48.960665500 +0200 +++ new/girara-0.3.7/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -girara - user interface library -=============================== - -girara is a library that implements a user interface that focuses on simplicity -and minimalism. It consists of three main components: The view is a widget that -represents the actual application (e.g.: a web site or a document). The input -bar is used to execute commands of the application, while the status bar -notifies the user with current information. It is designed to replace and the -enhance the user interface that is used by zathura. - -Requirements ------------- - -The following dependencies are required: - -* gtk3 (>= 3.20) -* glib (>= 2.50) - -The following dependencies are optional: - -* libnotify: notification support -* json-c: configuration dumping support - -For building girara, the following dependencies are also required: - -* meson (>= 0.48) -* gettext - -The following dependencies are optional build-time only dependencies: - -* check: for tests -* doxygen: HTML documentation - -To disable the optional support for libnotify and json-c, configure the build -system with -Dnotify=disabled or -Djson=disabled. - -Installation ------------- - -Run the following command to build and install girara to your system using -meson's ninja backend: - - meson build - cd build - ninja - ninja install - -Note that the default backend for meson might vary based on the platform. Please -refer to the meson documentation for platform specific dependencies. - -Bugs ----- - -Please report bugs at https://git.pwmt.org/pwmt/girara. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/README.md new/girara-0.3.7/README.md --- old/girara-0.3.6/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/girara-0.3.7/README.md 2022-02-13 19:11:34.000000000 +0100 @@ -0,0 +1,54 @@ +girara - user interface library +=============================== + +girara is a library that implements a user interface that focuses on simplicity +and minimalism. It consists of three main components: The view is a widget that +represents the actual application (e.g.: a web site or a document). The input +bar is used to execute commands of the application, while the status bar +notifies the user with current information. It is designed to replace and the +enhance the user interface that is used by zathura. + +Requirements +------------ + +The following dependencies are required: + +* `gtk3` (>= 3.20) +* `glib` (>= 2.50) + +The following dependencies are optional: + +* `libnotify`: notification support +* `json-c`: configuration dumping support + +For building girara, the following dependencies are also required: + +* `meson` (>= 0.56) +* `gettext` + +The following dependencies are optional build-time only dependencies: + +* `check` (>= 0.11): for tests +* `doxygen`: HTML documentation + +To disable the optional support for `libnotify` and `json-c`, configure the build +system with `-Dnotify=disabled` or `-Djson=disabled`. + +Installation +------------ + +Run the following command to build and install girara to your system using +meson's ninja backend: + + meson build + cd build + ninja + ninja install + +Note that the default backend for meson might vary based on the platform. Please +refer to the meson documentation for platform specific dependencies. + +Bugs +---- + +Please report bugs at https://git.pwmt.org/pwmt/girara. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/doc/meson.build new/girara-0.3.7/doc/meson.build --- old/girara-0.3.6/doc/meson.build 2021-07-14 17:17:48.964665700 +0200 +++ new/girara-0.3.7/doc/meson.build 2022-02-13 19:11:34.000000000 +0100 @@ -1,7 +1,7 @@ doxygen = find_program('doxygen', required: get_option('docs')) if doxygen.found() conf_data = configuration_data() - conf_data.set('DOXYGEN_INPUT', meson.source_root()) + conf_data.set('DOXYGEN_INPUT', meson.project_source_root()) conf_data.set('DOXYGEN_OUTPUT', meson.current_build_dir()) doxyfile = configure_file( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/girara/config.c new/girara-0.3.7/girara/config.c --- old/girara-0.3.6/girara/config.c 2021-07-14 17:17:48.964665700 +0200 +++ new/girara-0.3.7/girara/config.c 2022-02-13 19:11:34.000000000 +0100 @@ -290,18 +290,28 @@ gchar** argv = NULL; gint argc = 0; + GError* error = NULL; /* parse current line */ - if (g_shell_parse_argv(line, &argc, &argv, NULL) != FALSE) { + if (g_shell_parse_argv(line, &argc, &argv, &error) != FALSE) { for (int i = 1; i < argc; i++) { char* argument = g_strdup(argv[i]); girara_list_append(argument_list, argument); } } else { girara_list_free(argument_list); - fclose(file); - g_free(line); - return false; + if (error->code != G_SHELL_ERROR_EMPTY_STRING) { + girara_error("Could not parse line %d in '%s': %s", line_number, path, error->message); + + g_error_free(error); + fclose(file); + g_free(line); + return false; + } else { + g_error_free(error); + g_free(line); + continue; + } } /* include gets a special treatment */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/girara/utils.c new/girara-0.3.7/girara/utils.c --- old/girara-0.3.6/girara/utils.c 2021-07-14 17:17:48.980665700 +0200 +++ new/girara-0.3.7/girara/utils.c 2022-02-13 19:11:34.000000000 +0100 @@ -389,7 +389,7 @@ } *ptr = tmp; - return *ptr; + return tmp; error_free: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/girara/utils.h new/girara-0.3.7/girara/utils.h --- old/girara-0.3.6/girara/utils.h 2021-07-14 17:17:48.980665700 +0200 +++ new/girara-0.3.7/girara/utils.h 2022-02-13 19:11:34.000000000 +0100 @@ -124,7 +124,7 @@ * @param size Number of bytes * @return Pointer to the allocated memory block or NULL */ -void* girara_safe_realloc(void** ptr, size_t size) GIRARA_ALLOC_SIZE(2) GIRARA_VISIBLE; +void* girara_safe_realloc(void** ptr, size_t size) GIRARA_ALLOC_SIZE(2) GIRARA_VISIBLE GIRARA_DEPRECATED_; /** * Escape \\, \\t, ", ' and spaces in strings. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/meson.build new/girara-0.3.7/meson.build --- old/girara-0.3.6/meson.build 2021-07-14 17:17:48.980665700 +0200 +++ new/girara-0.3.7/meson.build 2022-02-13 19:11:34.000000000 +0100 @@ -1,6 +1,6 @@ project('girara', 'c', - version: '0.3.6', - meson_version: '>=0.48', + version: '0.3.7', + meson_version: '>=0.56', default_options: ['c_std=c11', 'warning_level=3'], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/ar.po new/girara-0.3.7/po/ar.po --- old/girara-0.3.6/po/ar.po 2021-07-14 17:17:49.016666000 +0200 +++ new/girara-0.3.7/po/ar.po 2022-02-13 19:11:34.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Arabic (http://www.transifex.com/pwmt/girara/language/ar/)\n" "Language: ar\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/de.po new/girara-0.3.7/po/de.po --- old/girara-0.3.6/po/de.po 2021-07-14 17:17:49.020666000 +0200 +++ new/girara-0.3.7/po/de.po 2022-02-13 19:11:34.000000000 +0100 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: German (http://www.transifex.com/pwmt/girara/language/de/)\n" "Language: de\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/el.po new/girara-0.3.7/po/el.po --- old/girara-0.3.6/po/el.po 2021-07-14 17:17:49.020666000 +0200 +++ new/girara-0.3.7/po/el.po 2022-02-13 19:11:34.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Greek (http://www.transifex.com/pwmt/girara/language/el/)\n" "Language: el\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/es.po new/girara-0.3.7/po/es.po --- old/girara-0.3.6/po/es.po 2021-07-14 17:17:49.020666000 +0200 +++ new/girara-0.3.7/po/es.po 2022-02-13 19:11:34.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Spanish (http://www.transifex.com/pwmt/girara/language/es/)\n" "Language: es\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/fa_IR.po new/girara-0.3.7/po/fa_IR.po --- old/girara-0.3.6/po/fa_IR.po 2021-07-14 17:17:49.020666000 +0200 +++ new/girara-0.3.7/po/fa_IR.po 2022-02-13 19:11:34.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2020-03-12 21:19+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Goudarz Jafari <[email protected]>\n" "Language-Team: Persian (Iran) (http://www.transifex.com/pwmt/girara/language/"; "fa_IR/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/fr.po new/girara-0.3.7/po/fr.po --- old/girara-0.3.6/po/fr.po 2021-07-14 17:17:49.028665800 +0200 +++ new/girara-0.3.7/po/fr.po 2022-02-13 19:11:34.000000000 +0100 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: French (http://www.transifex.com/pwmt/girara/language/fr/)\n" "Language: fr\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/he.po new/girara-0.3.7/po/he.po --- old/girara-0.3.6/po/he.po 2021-07-14 17:17:49.028665800 +0200 +++ new/girara-0.3.7/po/he.po 2022-02-13 19:11:34.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Hebrew (http://www.transifex.com/pwmt/girara/language/he/)\n" "Language: he\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/it.po new/girara-0.3.7/po/it.po --- old/girara-0.3.6/po/it.po 2021-07-14 17:17:49.036666000 +0200 +++ new/girara-0.3.7/po/it.po 2022-02-13 19:11:34.000000000 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Italian (http://www.transifex.com/pwmt/girara/language/it/)\n" "Language: it\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/nl.po new/girara-0.3.7/po/nl.po --- old/girara-0.3.6/po/nl.po 2021-07-14 17:17:49.036666000 +0200 +++ new/girara-0.3.7/po/nl.po 2022-02-13 19:11:34.000000000 +0100 @@ -2,14 +2,15 @@ # SPDX-License-Identifier: Zlib # # Translators: +# Heimen Stoffels <[email protected]>, 2021 # Heimen Stoffels <[email protected]>, 2018 msgid "" msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" -"Last-Translator: Sebastian Ramacher <[email protected]>\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 17:37+0000\n" +"Last-Translator: Heimen Stoffels <[email protected]>\n" "Language-Team: Dutch (http://www.transifex.com/pwmt/girara/language/nl/)\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -20,7 +21,7 @@ #: girara/commands.c:111 girara/commands.c:311 #, c-format msgid "Invalid number of arguments passed: %zu instead of at least %u" -msgstr "Ongeldig aantal argumenten: %zu i.p.v. minimaal %u" +msgstr "Ongeldig aantal aanvullende opties: %zu i.p.v. minimaal %u" #: girara/commands.c:145 #, c-format @@ -49,11 +50,11 @@ #: girara/commands.c:423 msgid "Not enough arguments." -msgstr "Onvoldoende argumenten." +msgstr "Onvoldoende aanvullende opties." #: girara/commands.c:428 msgid "Too many arguments." -msgstr "Teveel argumenten." +msgstr "Teveel aanvullende opties." #: girara/commands.c:441 #, c-format @@ -199,7 +200,7 @@ #: girara/config.c:162 msgid "Show or hide certain GUI elements" -msgstr "Bepaalde app-elementen weergeven of verbergen" +msgstr "Bepaalde toepassingselementen tonen of verbergen" #. commands #: girara/config.c:198 @@ -212,7 +213,7 @@ #: girara/config.c:200 msgid "Quit the program" -msgstr "Applicatie afsluiten" +msgstr "Toepassing afsluiten" #: girara/config.c:201 msgid "Set an option" @@ -220,7 +221,7 @@ #: girara/config.c:202 msgid "Unmap a key sequence" -msgstr "Toetsaanslag verwijderen" +msgstr "Toetsaanslag wissen" #: girara/config.c:204 msgid "Dump settings to a file" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/pl.po new/girara-0.3.7/po/pl.po --- old/girara-0.3.6/po/pl.po 2021-07-14 17:17:49.040665900 +0200 +++ new/girara-0.3.7/po/pl.po 2022-02-13 19:11:34.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Polish (http://www.transifex.com/pwmt/girara/language/pl/)\n" "Language: pl\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/pt_BR.po new/girara-0.3.7/po/pt_BR.po --- old/girara-0.3.6/po/pt_BR.po 2021-07-14 17:17:49.040665900 +0200 +++ new/girara-0.3.7/po/pt_BR.po 2022-02-13 19:11:34.000000000 +0100 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/pwmt/girara/"; "language/pt_BR/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/ru.po new/girara-0.3.7/po/ru.po --- old/girara-0.3.6/po/ru.po 2021-07-14 17:17:49.040665900 +0200 +++ new/girara-0.3.7/po/ru.po 2022-02-13 19:11:34.000000000 +0100 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2020-04-28 19:51+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: crt0r citrus\n" "Language-Team: Russian (http://www.transifex.com/pwmt/girara/language/ru/)\n" "Language: ru\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/sv.po new/girara-0.3.7/po/sv.po --- old/girara-0.3.6/po/sv.po 2021-07-14 17:17:49.040665900 +0200 +++ new/girara-0.3.7/po/sv.po 2022-02-13 19:11:34.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Swedish (http://www.transifex.com/pwmt/girara/language/sv/)\n" "Language: sv\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/tr.po new/girara-0.3.7/po/tr.po --- old/girara-0.3.6/po/tr.po 2021-07-14 17:17:49.040665900 +0200 +++ new/girara-0.3.7/po/tr.po 2022-02-13 19:11:34.000000000 +0100 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2019-06-01 09:25+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: Sebastian Ramacher <[email protected]>\n" "Language-Team: Turkish (http://www.transifex.com/pwmt/girara/language/tr/)\n" "Language: tr\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/po/uk_UA.po new/girara-0.3.7/po/uk_UA.po --- old/girara-0.3.6/po/uk_UA.po 2021-07-14 17:17:49.040665900 +0200 +++ new/girara-0.3.7/po/uk_UA.po 2022-02-13 19:11:34.000000000 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: girara\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 09:01+0200\n" -"PO-Revision-Date: 2020-05-09 09:43+0000\n" +"POT-Creation-Date: 2022-01-06 14:42+0100\n" +"PO-Revision-Date: 2021-07-14 15:12+0000\n" "Last-Translator: ???????? ?????????????????? <[email protected]>\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/pwmt/girara/"; "language/uk_UA/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/meson.build new/girara-0.3.7/tests/meson.build --- old/girara-0.3.6/tests/meson.build 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/meson.build 2022-02-13 19:11:34.000000000 +0100 @@ -1,4 +1,4 @@ -check = dependency('check', required: get_option('tests')) +check = dependency('check', required: get_option('tests'), version: '>=0.11') if check.found() test_dependencies = [ declare_dependency(link_with: girara), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/test_config.c new/girara-0.3.7/tests/test_config.c --- old/girara-0.3.6/tests/test_config.c 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/test_config.c 2022-02-13 19:11:34.000000000 +0100 @@ -12,39 +12,39 @@ START_TEST(test_config_parse) { girara_session_t* session = girara_session_create(); - fail_unless(session != NULL, "Failed to create girara session.", NULL); + ck_assert_msg(session != NULL, "Failed to create girara session."); int default_val = 1; - fail_unless(girara_setting_add(session, "test1", "default-string", STRING, false, NULL, NULL, NULL), - "Failed to add setting 'test1'", NULL); - fail_unless(girara_setting_add(session, "test2", &default_val, INT, false, NULL, NULL, NULL), - "Failed to add setting 'test2'", NULL); + ck_assert_msg(girara_setting_add(session, "test1", "default-string", STRING, false, NULL, NULL, NULL), + "Failed to add setting 'test1'"); + ck_assert_msg(girara_setting_add(session, "test2", &default_val, INT, false, NULL, NULL, NULL), + "Failed to add setting 'test2'"); char* filename = NULL; int fd = g_file_open_tmp(NULL, &filename, NULL); - fail_unless(fd != -1 && filename != NULL, "Couldn't open temporary file.", NULL); + ck_assert_msg(fd != -1 && filename != NULL, "Couldn't open temporary file."); GError* error = NULL; if (g_file_set_contents(filename, "set test1 config-string\n" \ "set test2 2\n", -1, &error) == FALSE) { - fail_unless(false, "Couldn't set content: %s", error->message, NULL); + ck_abort_msg("Couldn't set content: %s", error->message); g_error_free(error); } girara_config_parse(session, filename); char* ptr = NULL; - fail_unless(girara_setting_get(session, "test1", &ptr), "Failed to get setting 'test1'.", NULL); - fail_unless(g_strcmp0(ptr, "config-string") == 0, "Value of 'test1' doesn't match (got: %s, expected: %s", - ptr, "config-string", NULL); + ck_assert_msg(girara_setting_get(session, "test1", &ptr), "Failed to get setting 'test1'."); + ck_assert_msg(g_strcmp0(ptr, "config-string") == 0, "Value of 'test1' doesn't match (got: %s, expected: %s", + ptr, "config-string"); g_free(ptr); int real_val = 0; - fail_unless(girara_setting_get(session, "test2", &real_val), "Failed to get setting 'test1'.", NULL); - fail_unless(real_val == 2, "Value of 'test2' doesn't match (got: %d, expected: %d", - real_val, 2, NULL); + ck_assert_msg(girara_setting_get(session, "test2", &real_val), "Failed to get setting 'test1'."); + ck_assert_msg(real_val == 2, "Value of 'test2' doesn't match (got: %d, expected: %d", + real_val, 2); close(fd); - fail_unless(g_remove(filename) == 0, "Failed to remove temporary file.", NULL); + ck_assert_msg(g_remove(filename) == 0, "Failed to remove temporary file."); g_free(filename); girara_session_destroy(session); } END_TEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/test_datastructures.c new/girara-0.3.7/tests/test_datastructures.c --- old/girara-0.3.6/tests/test_datastructures.c 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/test_datastructures.c 2022-02-13 19:11:34.000000000 +0100 @@ -15,8 +15,8 @@ static void list_free(void* data) { - fail_unless(list_free_called == 0u, NULL); - fail_unless((intptr_t) data == 0xDEAD, NULL); + ck_assert_uint_eq(list_free_called, 0u); + ck_assert_uint_eq((intptr_t) data, 0xDEAD); ++list_free_called; } @@ -24,7 +24,7 @@ START_TEST(test_datastructures_list) { girara_list_t* list = girara_list_new(); // size of empty list - fail_unless(girara_list_size(list) == 0, NULL); + ck_assert_uint_eq(girara_list_size(list), 0); // append for (intptr_t i = 0; i != 10; ++i) { @@ -32,24 +32,24 @@ } // size of list - fail_unless(girara_list_size(list) == 10, NULL); + ck_assert_uint_eq(girara_list_size(list), 10); // iterator tests girara_list_iterator_t* iter = girara_list_iterator(list); - fail_unless(iter != NULL, NULL); + ck_assert_ptr_nonnull(iter); for (intptr_t i = 0; i != 10; ++i) { - fail_unless(((intptr_t) girara_list_iterator_data(iter) == i), NULL); + ck_assert_uint_eq((intptr_t) girara_list_iterator_data(iter), i); if (i < 9) { - fail_unless((girara_list_iterator_is_valid(iter)), NULL); - fail_unless((girara_list_iterator_has_next(iter)), NULL); - fail_unless((girara_list_iterator_next(iter) != NULL), NULL); - fail_unless((girara_list_iterator_is_valid(iter)), NULL); + ck_assert(girara_list_iterator_is_valid(iter)); + ck_assert(girara_list_iterator_has_next(iter)); + ck_assert_ptr_nonnull(girara_list_iterator_next(iter)); + ck_assert(girara_list_iterator_is_valid(iter)); } else { - fail_unless((girara_list_iterator_is_valid(iter)), NULL); - fail_unless((!girara_list_iterator_has_next(iter)), NULL); - fail_unless((girara_list_iterator_next(iter) == NULL), NULL); - fail_unless((!girara_list_iterator_is_valid(iter)), NULL); + ck_assert(girara_list_iterator_is_valid(iter)); + ck_assert(!girara_list_iterator_has_next(iter)); + ck_assert_ptr_null(girara_list_iterator_next(iter)); + ck_assert(!girara_list_iterator_is_valid(iter)); } } @@ -59,40 +59,40 @@ // contains list = girara_list_new(); for (intptr_t i = 0; i != 10; ++i) { - fail_unless((girara_list_contains(list, (void*) i) == false), NULL); + ck_assert(!girara_list_contains(list, (void*) i)); girara_list_append(list, (void*)i); - fail_unless((girara_list_contains(list, (void*) i) == true), NULL); + ck_assert(girara_list_contains(list, (void*) i)); } // position for (intptr_t i = 0; i != 10; ++i) { - fail_unless((girara_list_position(list, (void*) i) == i), NULL); + ck_assert_int_eq(girara_list_position(list, (void*) i), i); } - fail_unless((girara_list_position(list, (void*) 10) == -1), NULL); + ck_assert_int_eq(girara_list_position(list, (void*) 10), -1); // remove for (intptr_t i = 9; i >= 0; --i) { - fail_unless((girara_list_contains(list, (void*) i) == true), NULL); + ck_assert(girara_list_contains(list, (void*) i)); girara_list_remove(list, (void*)i); - fail_unless((girara_list_contains(list, (void*)i) == false), NULL); + ck_assert(!girara_list_contains(list, (void*) i)); girara_list_append(list, (void*)i); } iter = girara_list_iterator(list); - fail_unless((iter != NULL), NULL); + ck_assert_ptr_nonnull(iter); for (intptr_t i = 9; i >= 0; --i) { - fail_unless(((intptr_t)girara_list_iterator_data(iter) == i), NULL); + ck_assert_int_eq((intptr_t)girara_list_iterator_data(iter), i); if (i > 0) { - fail_unless((girara_list_iterator_is_valid(iter)), NULL); - fail_unless((girara_list_iterator_has_next(iter)), NULL); - fail_unless((girara_list_iterator_next(iter) != NULL), NULL); - fail_unless((girara_list_iterator_is_valid(iter)), NULL); + ck_assert(girara_list_iterator_is_valid(iter)); + ck_assert(girara_list_iterator_has_next(iter)); + ck_assert_ptr_nonnull(girara_list_iterator_next(iter)); + ck_assert(girara_list_iterator_is_valid(iter)); } else { - fail_unless((girara_list_iterator_is_valid(iter)), NULL); - fail_unless((!girara_list_iterator_has_next(iter)), NULL); - fail_unless((girara_list_iterator_next(iter) == NULL), NULL); - fail_unless((!girara_list_iterator_is_valid(iter)), NULL); + ck_assert(girara_list_iterator_is_valid(iter)); + ck_assert(!girara_list_iterator_has_next(iter)); + ck_assert_ptr_null(girara_list_iterator_next(iter)); + ck_assert(!girara_list_iterator_is_valid(iter)); } } @@ -103,20 +103,20 @@ START_TEST(test_datastructures_list_merge) { girara_list_t* list1 = girara_list_new(); girara_list_t* list2 = girara_list_new(); - fail_unless((list1 != NULL), NULL); - fail_unless((list2 != NULL), NULL); + ck_assert_ptr_nonnull(list1); + ck_assert_ptr_nonnull(list2); - fail_unless((girara_list_merge(NULL, NULL) == NULL), NULL); - fail_unless((girara_list_merge(list1, NULL) == list1), NULL); - fail_unless((girara_list_merge(NULL, list2) == NULL), NULL); + ck_assert_ptr_null(girara_list_merge(NULL, NULL)); + ck_assert_ptr_eq(girara_list_merge(list1, NULL), list1); + ck_assert_ptr_null(girara_list_merge(NULL, list2)); girara_list_append(list1, (void*)0); girara_list_append(list2, (void*)1); girara_list_t* list3 = girara_list_merge(list1, list2); - fail_unless((list3 == list1), NULL); - fail_unless((girara_list_nth(list3, 0) == (void*)0), NULL); - fail_unless((girara_list_nth(list3, 1) == (void*)1), NULL); + ck_assert_ptr_eq(list3, list1); + ck_assert_ptr_eq(girara_list_nth(list3, 0), (void*)0); + ck_assert_ptr_eq(girara_list_nth(list3, 1), (void*)1); girara_list_free(list1); girara_list_free(list2); } END_TEST @@ -124,26 +124,26 @@ START_TEST(test_datastructures_list_free_empty) { // free empty list girara_list_t* list = girara_list_new(); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_free(list); list = girara_list_new2(NULL); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_free(list); list = girara_list_new2(g_free); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_free(list); } END_TEST START_TEST(test_datastructures_list_free_already_cleared) { // free cleared list girara_list_t* list = girara_list_new(); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_append(list, (void*) 0xDEAD); - fail_unless((girara_list_size(list) == 1), NULL); + ck_assert_uint_eq(girara_list_size(list), 1); girara_list_clear(list); - fail_unless((girara_list_size(list) == 0), NULL); + ck_assert_uint_eq(girara_list_size(list), 0); girara_list_free(list); } END_TEST @@ -151,37 +151,37 @@ // free function girara_list_t* list = girara_list_new(); list_free_called = 0; - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_set_free_function(list, list_free); girara_list_append(list, (void*) 0xDEAD); girara_list_free(list); - fail_unless((list_free_called == 1), NULL); + ck_assert_uint_eq(list_free_called, 1); } END_TEST START_TEST(test_datastructures_list_free_free_function_remove) { // remove with free function list_free_called = 0; girara_list_t* list = girara_list_new2(list_free); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_append(list, (void*)0xDEAD); girara_list_remove(list, (void*)0xDEAD); - fail_unless((girara_list_size(list) == 0), NULL); + ck_assert_uint_eq(girara_list_size(list), 0); girara_list_free(list); - fail_unless((list_free_called == 1), NULL); + ck_assert_uint_eq(list_free_called, 1); } END_TEST START_TEST(test_datastructures_sorted_list_basic) { girara_list_t* list = girara_sorted_list_new(NULL); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_free(list); } END_TEST START_TEST(test_datastructures_sorted_list) { girara_list_t* list = girara_sorted_list_new2((girara_compare_function_t) g_strcmp0, (girara_free_function_t) g_free); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); girara_list_t* unsorted_list = girara_list_new2((girara_free_function_t) g_free); - fail_unless((unsorted_list != NULL), NULL); + ck_assert_ptr_nonnull(unsorted_list); static const char* test_strings[] = { "A", @@ -208,20 +208,20 @@ girara_list_append(unsorted_list, (void*)g_strdup(*p)); } - fail_unless((girara_list_size(list) == sizeof(test_strings) / sizeof(char*) - 1), NULL); - fail_unless((girara_list_size(unsorted_list) == sizeof(test_strings) / sizeof(char*) - 1), NULL); + ck_assert_uint_eq(girara_list_size(list), sizeof(test_strings) / sizeof(char*) - 1); + ck_assert_uint_eq(girara_list_size(unsorted_list), sizeof(test_strings) / sizeof(char*) - 1); // check sorting const char** p = test_strings_sorted; GIRARA_LIST_FOREACH(list, const char*, iter, value) - fail_unless((g_strcmp0(value, *p) == 0), NULL); + ck_assert_str_eq(value, *p); ++p; GIRARA_LIST_FOREACH_END(list, const char*, iter, value); girara_list_sort(unsorted_list, (girara_compare_function_t) g_strcmp0); p = test_strings_sorted; GIRARA_LIST_FOREACH(unsorted_list, const char*, iter, value) - fail_unless((g_strcmp0(value, *p) == 0), NULL); + ck_assert_str_eq(value, *p); ++p; GIRARA_LIST_FOREACH_END(unsorted_list, const char*, iter, value); @@ -233,11 +233,11 @@ node_free(void* data) { if (g_strcmp0((char*)data, "root") == 0) { - fail_unless((node_free_called == 0), NULL); + ck_assert_uint_eq(node_free_called, 0); } else if (g_strcmp0((char*)data, "child") == 0) { - fail_unless((node_free_called == 1), NULL); + ck_assert_uint_eq(node_free_called, 1); } else { - fail("Should not be reached"); + ck_abort_msg("Should not be reached"); } ++node_free_called; @@ -245,31 +245,31 @@ START_TEST(test_datastructures_node) { girara_tree_node_t* root = girara_node_new("root"); - fail_unless((girara_node_get_num_children(root) == 0), NULL); - fail_unless((girara_node_get_parent(root) == NULL), NULL); - fail_unless((girara_node_get_root(root) == root), NULL); - fail_unless((g_strcmp0((char*) girara_node_get_data(root), "root") == 0), NULL); + ck_assert_uint_eq(girara_node_get_num_children(root), 0); + ck_assert_ptr_null(girara_node_get_parent(root)); + ck_assert_ptr_eq(girara_node_get_root(root), root); + ck_assert_str_eq((char*) girara_node_get_data(root), "root"); girara_list_t* rchildren = girara_node_get_children(root); - fail_unless((rchildren != NULL), NULL); - fail_unless((girara_list_size(rchildren) == 0), NULL); + ck_assert_ptr_nonnull(rchildren); + ck_assert_uint_eq(girara_list_size(rchildren), 0); girara_list_free(rchildren); girara_node_free(root); root = girara_node_new("root"); girara_node_set_free_function(root, node_free); girara_node_append_data(root, "child"); - fail_unless((girara_node_get_num_children(root) == 1), NULL); - fail_unless((node_free_called == 0), NULL); + ck_assert_uint_eq(girara_node_get_num_children(root), 1); + ck_assert_uint_eq(node_free_called, 0); girara_node_free(root); - fail_unless((node_free_called == 2), NULL); + ck_assert_uint_eq(node_free_called, 2); node_free_called = 0; root = girara_node_new("root"); girara_node_set_free_function(root, node_free); girara_node_set_data(root, "child"); - fail_unless((node_free_called == 1), NULL); + ck_assert_uint_eq(node_free_called, 1); girara_node_free(root); - fail_unless((node_free_called == 2), NULL); + ck_assert_uint_eq(node_free_called, 2); root = girara_node_new(g_strdup("root")); girara_node_set_free_function(root, g_free); @@ -278,47 +278,47 @@ for (unsigned int j = 0; j != 10; ++j) { girara_node_append_data(child, g_strdup_printf("child_%u_%u", i, j)); } - fail_unless((girara_node_get_num_children(child) == 10), NULL); + ck_assert_uint_eq(girara_node_get_num_children(child), 10); } - fail_unless((girara_node_get_num_children(root) == 5), NULL); + ck_assert_uint_eq(girara_node_get_num_children(root), 5); girara_list_t* children = girara_node_get_children(root); - fail_unless((children != NULL), NULL); - fail_unless((girara_list_size(children) == 5), NULL); + ck_assert_ptr_nonnull(children); + ck_assert_uint_eq(girara_list_size(children), 5); unsigned int i = 0; girara_list_iterator_t* iter = girara_list_iterator(children); while (girara_list_iterator_is_valid(iter)) { char* expected = g_strdup_printf("child_%u", i); girara_tree_node_t* child = (girara_tree_node_t*)girara_list_iterator_data(iter); - fail_unless((g_strcmp0((char*)girara_node_get_data(child), expected) == 0), NULL); - fail_unless((girara_node_get_parent(child) == root), NULL); - fail_unless((girara_node_get_root(child) == root), NULL); + ck_assert_str_eq((char*)girara_node_get_data(child), expected); + ck_assert_ptr_eq(girara_node_get_parent(child), root); + ck_assert_ptr_eq(girara_node_get_root(child), root); g_free(expected); girara_list_t* grandchildren = girara_node_get_children(child); - fail_unless((grandchildren != NULL), NULL); - fail_unless((girara_list_size(grandchildren) == 10), NULL); + ck_assert_ptr_nonnull(grandchildren); + ck_assert_uint_eq(girara_list_size(grandchildren), 10); unsigned int j = 0; girara_list_iterator_t* iter2 = girara_list_iterator(grandchildren); while (girara_list_iterator_is_valid(iter2)) { expected = g_strdup_printf("child_%u_%u", i, j); girara_tree_node_t* gchild = (girara_tree_node_t*)girara_list_iterator_data(iter2); - fail_unless((g_strcmp0((char*)girara_node_get_data(gchild), expected) == 0), NULL); - fail_unless((girara_node_get_parent(gchild) == child), NULL); - fail_unless((girara_node_get_root(gchild) == root), NULL); + ck_assert_str_eq((char*)girara_node_get_data(gchild), expected); + ck_assert_ptr_eq(girara_node_get_parent(gchild), child); + ck_assert_ptr_eq(girara_node_get_root(gchild), root); g_free(expected); ++j; girara_list_iterator_next(iter2); } - fail_unless((j == 10), NULL); + ck_assert_uint_eq(j, 10); girara_list_iterator_free(iter2); girara_list_free(grandchildren); girara_list_iterator_next(iter); ++i; } - fail_unless((i == 5), NULL); + ck_assert_uint_eq(i, 5); girara_list_iterator_free(iter); girara_list_free(children); @@ -337,28 +337,28 @@ START_TEST(test_datastructures_list_find) { girara_list_t* list = girara_list_new(); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); /* test parameters */ - fail_unless((girara_list_find(NULL, NULL, NULL) == NULL), NULL); - fail_unless((girara_list_find(list, NULL, NULL) == NULL), NULL); - fail_unless((girara_list_find(NULL, NULL, (void*) 0xDEAD) == NULL), NULL); - fail_unless((girara_list_find(NULL, find_compare, NULL) == NULL), NULL); + ck_assert_ptr_null(girara_list_find(NULL, NULL, NULL)); + ck_assert_ptr_null(girara_list_find(list, NULL, NULL)); + ck_assert_ptr_null(girara_list_find(NULL, NULL, (void*) 0xDEAD)); + ck_assert_ptr_null(girara_list_find(NULL, find_compare, NULL)); /* test functionality */ girara_list_append(list, (void*) 0xDEAD); - fail_unless((girara_list_find(list, find_compare, (void*) 0xDEAD) == NULL), NULL); - fail_unless((girara_list_find(list, find_compare, (void*) 0xCAFE) != NULL), NULL); + ck_assert_ptr_null(girara_list_find(list, find_compare, (void*) 0xDEAD)); + ck_assert_ptr_nonnull(girara_list_find(list, find_compare, (void*) 0xCAFE)); girara_list_free(list); } END_TEST START_TEST(test_datastructures_list_prepend) { girara_list_t* list = girara_list_new(); - fail_unless((list != NULL), NULL); + ck_assert_ptr_nonnull(list); /* test parameters */ girara_list_prepend(list, NULL); - fail_unless((girara_list_size(list) != 0), NULL); + ck_assert_uint_ne(girara_list_size(list), 0); girara_list_free(list); } END_TEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/test_session.c new/girara-0.3.7/tests/test_session.c --- old/girara-0.3.6/tests/test_session.c 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/test_session.c 2022-02-13 19:11:34.000000000 +0100 @@ -7,15 +7,15 @@ START_TEST(test_create) { girara_session_t* session = girara_session_create(); - fail_unless(session != NULL, "Could not create session"); + ck_assert_msg(session != NULL, "Could not create session"); girara_session_destroy(session); } END_TEST START_TEST(test_init) { girara_session_t* session = girara_session_create(); - fail_unless(session != NULL, "Could not create session"); + ck_assert_msg(session != NULL, "Could not create session"); bool result = girara_session_init(session, NULL); - fail_unless(result == true, "Could not init session"); + ck_assert_msg(result == true, "Could not init session"); girara_session_destroy(session); } END_TEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/test_setting.c new/girara-0.3.7/tests/test_setting.c --- old/girara-0.3.6/tests/test_setting.c 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/test_setting.c 2022-02-13 19:11:34.000000000 +0100 @@ -8,36 +8,36 @@ START_TEST(test_settings_basic) { girara_session_t* session = girara_session_create(); - fail_unless(session != NULL, "Couldn't create session.", NULL); + ck_assert_msg(session != NULL, "Couldn't create session."); - fail_unless(girara_setting_add(session, "test", NULL, STRING, false, NULL, NULL, NULL), NULL); + ck_assert(girara_setting_add(session, "test", NULL, STRING, false, NULL, NULL, NULL)); char* ptr = NULL; - fail_unless(girara_setting_get(session, "test", &ptr), NULL); - fail_unless(ptr == NULL, NULL); + ck_assert(girara_setting_get(session, "test", &ptr)); + ck_assert_ptr_null(ptr); - fail_unless(girara_setting_set(session, "test", "value"), NULL); - fail_unless(girara_setting_get(session, "test", &ptr), NULL); - fail_unless(g_strcmp0(ptr, "value") == 0, NULL); + ck_assert(girara_setting_set(session, "test", "value")); + ck_assert(girara_setting_get(session, "test", &ptr)); + ck_assert_str_eq(ptr, "value"); g_free(ptr); ptr = NULL; - fail_unless(!girara_setting_get(session, "does-not-exist", &ptr), NULL); - fail_unless(ptr == NULL, NULL); + ck_assert(!girara_setting_get(session, "does-not-exist", &ptr)); + ck_assert_ptr_null(ptr); - fail_unless(girara_setting_add(session, "test2", "value", STRING, false, NULL, NULL, NULL), NULL); - fail_unless(girara_setting_get(session, "test2", &ptr), NULL); - fail_unless(g_strcmp0(ptr, "value") == 0, NULL); + ck_assert(girara_setting_add(session, "test2", "value", STRING, false, NULL, NULL, NULL)); + ck_assert(girara_setting_get(session, "test2", &ptr)); + ck_assert_str_eq(ptr, "value"); g_free(ptr); ptr = NULL; - fail_unless(!girara_setting_add(session, "test3", NULL, INT, false, NULL, NULL, NULL), NULL); - fail_unless(!girara_setting_get(session, "test3", &ptr), NULL); - fail_unless(ptr == NULL, NULL); + ck_assert(!girara_setting_add(session, "test3", NULL, INT, false, NULL, NULL, NULL)); + ck_assert(!girara_setting_get(session, "test3", &ptr)); + ck_assert_ptr_null(ptr); float val = 0.0, rval = 0.0; - fail_unless(girara_setting_add(session, "test4", &val, FLOAT, false, NULL, NULL, NULL), NULL); - fail_unless(girara_setting_get(session, "test4", &rval), NULL); - fail_unless(val == rval, NULL); + ck_assert(girara_setting_add(session, "test4", &val, FLOAT, false, NULL, NULL, NULL)); + ck_assert(girara_setting_get(session, "test4", &rval)); + ck_assert_float_eq(val, rval); girara_session_destroy(session); } END_TEST @@ -47,22 +47,22 @@ static void setting_callback(girara_session_t* session, const char* name, girara_setting_type_t type, const void* value, void* data) { - fail_unless(callback_called == 0, NULL); - fail_unless(session != NULL, NULL); - fail_unless(g_strcmp0(name, "test") == 0, NULL); - fail_unless(type == STRING, NULL); - fail_unless(g_strcmp0(value, "value") == 0, NULL); - fail_unless(g_strcmp0(data, "data") == 0, NULL); + ck_assert_uint_eq(callback_called, 0); + ck_assert_ptr_nonnull(session); + ck_assert_str_eq(name, "test"); + ck_assert_uint_eq(type, STRING); + ck_assert_str_eq(value, "value"); + ck_assert_str_eq(data, "data"); callback_called++; } START_TEST(test_settings_callback) { girara_session_t* session = girara_session_create(); - fail_unless(session != NULL, NULL); + ck_assert_ptr_nonnull(session); - fail_unless(girara_setting_add(session, "test", "oldvalue", STRING, false, NULL, setting_callback, "data"), NULL); - fail_unless(girara_setting_set(session, "test", "value"), NULL); - fail_unless(callback_called == 1, NULL); + ck_assert(girara_setting_add(session, "test", "oldvalue", STRING, false, NULL, setting_callback, "data")); + ck_assert(girara_setting_set(session, "test", "value")); + ck_assert_uint_eq(callback_called, 1); girara_session_destroy(session); } END_TEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/test_utils.c new/girara-0.3.7/tests/test_utils.c --- old/girara-0.3.6/tests/test_utils.c 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/test_utils.c 2022-02-13 19:11:34.000000000 +0100 @@ -27,7 +27,7 @@ girara_list_append(list, g_strdup(pw->pw_name)); errno = 0; } - fail_unless(errno == 0, "Non-zero errno :%d", errno, NULL); + ck_assert_msg(errno == 0, "Non-zero errno :%d", errno); endpwent(); return list; @@ -39,13 +39,13 @@ girara_list_t* list = read_pwd_info(); girara_list_iterator_t* iter = girara_list_iterator(list); - fail_unless(iter != NULL, "Could not create iterator", NULL); + ck_assert_ptr_nonnull(iter); while (girara_list_iterator_is_valid(iter)) { const char* username = (const char*) girara_list_iterator_data(iter); gchar* result = girara_get_home_directory(username); if (!home || g_strcmp0(user, username) != 0) { - fail_unless(result != NULL && strlen(result) != 0, "Home directory is empty", NULL); + ck_assert_msg(result != NULL && strlen(result) != 0, "Home directory is empty"); } g_free(result); girara_list_iterator_next(iter); @@ -59,25 +59,25 @@ if (home) { gchar* result = girara_get_home_directory(NULL); - fail_unless(g_strcmp0(result, home) == 0, "Home directory is not the same", NULL); + ck_assert_str_eq(result, home); g_free(result); } } END_TEST START_TEST(test_fix_path_basic) { gchar* result = girara_fix_path("/test"); - fail_unless(g_strcmp0(result, "/test") == 0, - "Fix path result does not match (got: %s, expected: %s)", result, "test", NULL); + ck_assert_msg(g_strcmp0(result, "/test") == 0, + "Fix path result does not match (got: %s, expected: %s)", result, "test"); g_free(result); result = girara_fix_path("/test/test"); - fail_unless(g_strcmp0(result, "/test/test") == 0, - "Fix path result does not match (got: %s, expected: %s)", result, "test/test", NULL); + ck_assert_msg(g_strcmp0(result, "/test/test") == 0, + "Fix path result does not match (got: %s, expected: %s)", result, "test/test"); g_free(result); result = girara_fix_path("test"); - fail_unless(g_str_has_suffix(result, "/test") == TRUE, - "Fix path result does not match (got: %s, expected: %s)", result, ".../test", NULL); + ck_assert_msg(g_str_has_suffix(result, "/test") == TRUE, + "Fix path result does not match (got: %s, expected: %s)", result, ".../test"); g_free(result); } END_TEST @@ -90,7 +90,7 @@ gchar* path = g_strdup_printf("~%s/test", username); gchar* result = girara_fix_path(path); if (!home || g_strcmp0(user, username) != 0) { - fail_unless(result != NULL && strlen(result) != 0, + ck_assert_msg(result != NULL && strlen(result) != 0, "Fix path result is empty"); } g_free(result); @@ -104,7 +104,7 @@ const gchar* expected) { const char* xdg_test_helper_path = g_getenv("XDG_TEST_HELPER_PATH"); - fail_unless(xdg_test_helper_path != NULL, "XDG_TEST_HELPER_PATH is not set", NULL); + ck_assert_msg(xdg_test_helper_path != NULL, "XDG_TEST_HELPER_PATH is not set"); gchar** envp = g_get_environ(); @@ -115,8 +115,8 @@ bool result = g_spawn_sync(NULL, argv, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, NULL, NULL); g_assert(result); g_assert(output); - fail_unless(g_strcmp0(output, expected) == 0, "Output is not the same (got: %s, expected: %s)", - output, expected, NULL); + ck_assert_msg(g_strcmp0(output, expected) == 0, "Output is not the same (got: %s, expected: %s)", + output, expected); g_free(output); envp = g_environ_setenv(envp, envvar, "~/xdg", TRUE); @@ -124,16 +124,16 @@ result = g_spawn_sync(NULL, argv, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, NULL, NULL); g_assert(result); g_assert(output); - fail_unless(g_strcmp0(output, "~/xdg") == 0, "Output is not the same (got: %s, expected: %s)", - output, "~/xdg", NULL); + ck_assert_msg(g_strcmp0(output, "~/xdg") == 0, "Output is not the same (got: %s, expected: %s)", + output, "~/xdg"); envp = g_environ_setenv(envp, envvar, "/home/test/xdg", TRUE); result= g_spawn_sync(NULL, argv, envp, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &output, NULL, NULL, NULL); g_assert(result); g_assert(output); - fail_unless(g_strcmp0(output, "/home/test/xdg") == 0, "Output is not the same (got: %s, expected: %s)", - output, "/home/test/xdg", NULL); + ck_assert_msg(g_strcmp0(output, "/home/test/xdg") == 0, "Output is not the same (got: %s, expected: %s)", + output, "/home/test/xdg"); g_free(argv[0]); g_free(argv[1]); @@ -149,12 +149,12 @@ } END_TEST START_TEST(test_file_invariants) { - fail_unless(girara_file_open(NULL, NULL) == NULL, NULL); - fail_unless(girara_file_open("somefile", NULL) == NULL, NULL); - fail_unless(girara_file_open(NULL, "r") == NULL, NULL); + ck_assert_ptr_null(girara_file_open(NULL, NULL)); + ck_assert_ptr_null(girara_file_open("somefile", NULL)); + ck_assert_ptr_null(girara_file_open(NULL, "r")); - fail_unless(girara_file_read_line(NULL) == NULL, NULL); - fail_unless(girara_file_read(NULL) == NULL, NULL); + ck_assert_ptr_null(girara_file_read_line(NULL)); + ck_assert_ptr_null(girara_file_read(NULL)); } END_TEST START_TEST(test_file_read) { @@ -164,95 +164,83 @@ gchar* path = NULL; int fd = g_file_open_tmp("girara.test.XXXXXX", &path, NULL); - fail_unless(fd != -1, "Failed to open temporary file.", NULL); - fail_unless(g_strcmp0(path, "") != 0, "Failed to open temporary file.", NULL); + ck_assert_msg(fd != -1, "Failed to open temporary file."); + ck_assert_msg(g_strcmp0(path, "") != 0, "Failed to open temporary file."); GError* error = NULL; if (g_file_set_contents(path, CONTENT, -1, &error) == FALSE) { - fail_unless(false, "Couldn't set content: %s", error->message, NULL); + ck_abort_msg("Couldn't set content: %s", error->message); g_error_free(error); } char* content = girara_file_read(path); - fail_unless(g_strcmp0(content, CONTENT) == 0, "Reading file failed", NULL); + ck_assert_msg(g_strcmp0(content, CONTENT) == 0, "Reading file failed"); free(content); FILE* file = girara_file_open(path, "r"); - fail_unless(file != NULL, NULL); + ck_assert_ptr_nonnull(file); for (size_t i = 0; i != NUMLINES; ++i) { char* line = girara_file_read_line(file); - fail_unless(g_strcmp0(line, LINES[i]) == 0, "Line doesn't match (got: %s, expected: %s)", - line, LINES[i], NULL); + ck_assert_msg(g_strcmp0(line, LINES[i]) == 0, "Line doesn't match (got: %s, expected: %s)", + line, LINES[i]); g_free(line); } fclose(file); close(fd); - fail_unless(g_remove(path) == 0, "Failed to remove temporary file.", NULL); + ck_assert_msg(g_remove(path) == 0, "Failed to remove temporary file."); g_free(path); } END_TEST -START_TEST(test_safe_realloc) { - fail_unless(girara_safe_realloc(NULL, 0u) == NULL, NULL); - - void* ptr = NULL; - fail_unless(girara_safe_realloc(&ptr, sizeof(int)) != NULL, NULL); - fail_unless(ptr != NULL, NULL); - fail_unless(girara_safe_realloc(&ptr, 1024*sizeof(int)) != NULL, NULL); - fail_unless(ptr != NULL, NULL); - fail_unless(girara_safe_realloc(&ptr, 0u) == NULL, NULL); - fail_unless(ptr == NULL, NULL); -} END_TEST - START_TEST(test_split_path) { - fail_unless(girara_split_path_array(NULL) == NULL, NULL); - fail_unless(girara_split_path_array("") == NULL, NULL); + ck_assert_ptr_null(girara_split_path_array(NULL)); + ck_assert_ptr_null(girara_split_path_array("")); girara_list_t* res = girara_split_path_array("one/path"); - fail_unless(res != NULL, NULL); - fail_unless(girara_list_size(res) == 1, NULL); - fail_unless(g_strcmp0(girara_list_nth(res, 0), "one/path") == 0, NULL); + ck_assert_ptr_nonnull(res); + ck_assert_uint_eq(girara_list_size(res), 1); + ck_assert_str_eq(girara_list_nth(res, 0), "one/path"); girara_list_free(res); res = girara_split_path_array("first/path:second/path"); - fail_unless(res != NULL, NULL); - fail_unless(girara_list_size(res) == 2, NULL); - fail_unless(g_strcmp0(girara_list_nth(res, 0), "first/path") == 0, NULL); - fail_unless(g_strcmp0(girara_list_nth(res, 1), "second/path") == 0, NULL); + ck_assert_ptr_nonnull(res); + ck_assert_uint_eq(girara_list_size(res), 2); + ck_assert_str_eq(girara_list_nth(res, 0), "first/path"); + ck_assert_str_eq(girara_list_nth(res, 1), "second/path"); girara_list_free(res); } END_TEST START_TEST(test_strings_replace_substrings_invalid) { - fail_unless(girara_replace_substring(NULL, NULL, NULL) == NULL); - fail_unless(girara_replace_substring("", NULL, NULL) == NULL); - fail_unless(girara_replace_substring("", "", NULL) == NULL); + ck_assert_ptr_null(girara_replace_substring(NULL, NULL, NULL)); + ck_assert_ptr_null(girara_replace_substring("", NULL, NULL)); + ck_assert_ptr_null(girara_replace_substring("", "", NULL)); } END_TEST START_TEST(test_strings_replace_substrings_nothing_to_replace) { char* result = girara_replace_substring("test", "n", "y"); - fail_unless(result != NULL); - fail_unless(strncmp(result, "test", 5) == 0); + ck_assert_ptr_nonnull(result); + ck_assert_int_eq(strncmp(result, "test", 5), 0); g_free(result); } END_TEST START_TEST(test_strings_replace_substrings_1) { char* result = girara_replace_substring("test", "e", "f"); - fail_unless(result != NULL); - fail_unless(strncmp(result, "tfst", 5) == 0); + ck_assert_ptr_nonnull(result); + ck_assert_int_eq(strncmp(result, "tfst", 5), 0); g_free(result); } END_TEST START_TEST(test_strings_replace_substrings_2) { char* result = girara_replace_substring("test", "es", "f"); - fail_unless(result != NULL); - fail_unless(strncmp(result, "tft", 4) == 0); + ck_assert_ptr_nonnull(result); + ck_assert_int_eq(strncmp(result, "tft", 4), 0); g_free(result); } END_TEST START_TEST(test_strings_replace_substrings_3) { char* result = girara_replace_substring("test", "e", "fg"); - fail_unless(result != NULL); - fail_unless(strncmp(result, "tfgst", 6) == 0); + ck_assert_ptr_nonnull(result); + ck_assert_int_eq(strncmp(result, "tfgst", 6), 0); g_free(result); } END_TEST @@ -288,11 +276,6 @@ tcase_add_test(tcase, test_file_read); suite_add_tcase(suite, tcase); - /* safe realloc */ - tcase = tcase_create("safe_realloc"); - tcase_add_test(tcase, test_safe_realloc); - suite_add_tcase(suite, tcase); - /* split path */ tcase = tcase_create("split_path"); tcase_add_test(tcase, test_split_path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/girara-0.3.6/tests/tests.c new/girara-0.3.7/tests/tests.c --- old/girara-0.3.6/tests/tests.c 2021-07-14 17:17:49.044666000 +0200 +++ new/girara-0.3.7/tests/tests.c 2022-02-13 19:11:34.000000000 +0100 @@ -32,5 +32,5 @@ void setup(void) { - fail_unless(gtk_init_check(NULL, NULL) == TRUE, "GTK+ initializitation failed", NULL); + ck_assert_msg(gtk_init_check(NULL, NULL) == TRUE, "GTK+ initializitation failed"); }
