glib-testing: init at 0.1.0

This commit is contained in:
Jan Tojnar 2020-02-08 04:36:49 +01:00 committed by worldofpeace
parent f9bc083256
commit ea06e0055e
5 changed files with 103 additions and 0 deletions
nixos/tests/installed-tests
pkgs
development/libraries/glib-testing
top-level

View File

@ -90,6 +90,7 @@ in
graphene = callInstalledTest ./graphene.nix {}; graphene = callInstalledTest ./graphene.nix {};
ibus = callInstalledTest ./ibus.nix {}; ibus = callInstalledTest ./ibus.nix {};
libgdata = callInstalledTest ./libgdata.nix {}; libgdata = callInstalledTest ./libgdata.nix {};
glib-testing = callInstalledTest ./glib-testing.nix {};
libxmlb = callInstalledTest ./libxmlb.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {};
ostree = callInstalledTest ./ostree.nix {}; ostree = callInstalledTest ./ostree.nix {};
xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {}; xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {};

View File

@ -0,0 +1,5 @@
{ pkgs, makeInstalledTest, ... }:
makeInstalledTest {
tested = pkgs.glib-testing;
}

View File

@ -0,0 +1,63 @@
{ stdenv
, fetchFromGitLab
, meson
, ninja
, pkgconfig
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
, glib
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "glib-testing";
version = "0.1.0";
outputs = [ "out" "dev" "devdoc" "installedTests" ];
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "pwithnall";
repo = "libglib-testing";
rev = version;
sha256 = "0xmycsrlqyji6sc2i4wvp2gxf3897z65a57ygihfnpjpyl7zlwkr";
};
patches = [
# allow installing installed tests to a separate output
./installed-tests-path.patch
];
nativeBuildInputs = [
meson
ninja
pkgconfig
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
];
propagatedBuildInputs = [
glib
];
mesonFlags = [
"-Dinstalled_tests=true"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
passthru = {
tests = {
installedTests = nixosTests.installed-tests.glib-testing;
};
};
meta = with stdenv.lib; {
description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib";
homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing";
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,32 @@
diff --git a/libglib-testing/tests/meson.build b/libglib-testing/tests/meson.build
index 4789c63..2b8525d 100644
--- a/libglib-testing/tests/meson.build
+++ b/libglib-testing/tests/meson.build
@@ -15,9 +15,9 @@ test_programs = [
['signal-logger', [], deps],
]
-installed_tests_metadir = join_paths(datadir, 'installed-tests',
+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests',
'libglib-testing-' + libglib_testing_api_version)
-installed_tests_execdir = join_paths(libexecdir, 'installed-tests',
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests',
'libglib-testing-' + libglib_testing_api_version)
foreach program: test_programs
@@ -48,4 +48,4 @@ foreach program: test_programs
exe,
env: envs,
)
-endforeach
\ No newline at end of file
+endforeach
diff --git a/meson_options.txt b/meson_options.txt
index e69263e..7cb1ee8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,3 +4,4 @@ option(
value: false,
description: 'enable installed tests'
)
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')

View File

@ -11738,6 +11738,8 @@ in
glib-networking = callPackage ../development/libraries/glib-networking {}; glib-networking = callPackage ../development/libraries/glib-networking {};
glib-testing = callPackage ../development/libraries/glib-testing { };
glirc = haskell.lib.justStaticExecutables haskellPackages.glirc; glirc = haskell.lib.justStaticExecutables haskellPackages.glirc;
gom = callPackage ../development/libraries/gom { }; gom = callPackage ../development/libraries/gom { };