Re-Revert Merge #184360: json-glib: add installed tests

This reverts commit 78182194c652df7bdcfa0a6a788d17895188b777.

Changed files
+47 -1
nixos
tests
installed-tests
pkgs
+1
nixos/tests/installed-tests/default.nix
···
gnome-photos = callInstalledTest ./gnome-photos.nix {};
graphene = callInstalledTest ./graphene.nix {};
gsconnect = callInstalledTest ./gsconnect.nix {};
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
librsvg = callInstalledTest ./librsvg.nix {};
···
gnome-photos = callInstalledTest ./gnome-photos.nix {};
graphene = callInstalledTest ./graphene.nix {};
gsconnect = callInstalledTest ./gsconnect.nix {};
+
json-glib = callInstalledTest ./json-glib.nix {};
ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {};
librsvg = callInstalledTest ./librsvg.nix {};
+5
nixos/tests/installed-tests/json-glib.nix
···
···
+
{ pkgs, makeInstalledTest, ... }:
+
+
makeInstalledTest {
+
tested = pkgs.json-glib;
+
}
+14 -1
pkgs/development/libraries/json-glib/default.nix
···
, glib
, meson
, ninja
, pkg-config
, gettext
, gobject-introspection
···
pname = "json-glib";
version = "1.6.6";
-
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4=";
};
strictDeps = true;
···
glib
];
# Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
# it should be a build-time dep for build
···
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
···
, glib
, meson
, ninja
+
, nixosTests
, pkg-config
, gettext
, gobject-introspection
···
pname = "json-glib";
version = "1.6.6";
+
outputs = [ "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4=";
};
+
+
patches = [
+
# Add option for changing installation path of installed tests.
+
./meson-add-installed-tests-prefix-option.patch
+
];
strictDeps = true;
···
glib
];
+
mesonFlags = [
+
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
+
];
# Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
# it should be a build-time dep for build
···
'';
passthru = {
+
tests = {
+
installedTests = nixosTests.installed-tests.json-glib;
+
};
+
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
+27
pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
···
···
+
diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
+
index 1eb56c8..dca444e 100644
+
--- a/json-glib/tests/meson.build
+
+++ b/json-glib/tests/meson.build
+
@@ -21,8 +21,9 @@ test_data = [
+
'stream-load.json',
+
]
+
+
-installed_test_bindir = join_paths(json_libexecdir, 'installed-tests', json_api_name)
+
-installed_test_datadir = join_paths(json_datadir, 'installed-tests', json_api_name)
+
+installed_test_prefix = get_option('installed_test_prefix')
+
+installed_test_bindir = join_paths(installed_test_prefix, 'libexec', 'installed-tests', json_api_name)
+
+installed_test_datadir = join_paths(installed_test_prefix, 'share', 'installed-tests', json_api_name)
+
+
install_data(test_data, install_dir: installed_test_bindir)
+
+
diff --git a/meson_options.txt b/meson_options.txt
+
index 068a03f..03f398a 100644
+
--- a/meson_options.txt
+
+++ b/meson_options.txt
+
@@ -10,3 +10,6 @@ option('man',
+
option('tests',
+
type: 'boolean', value: true,
+
description: 'Build the tests')
+
+option('installed_test_prefix',
+
+ description: 'Prefix for installed tests',
+
+ type: 'string')