summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-02-14 23:10:07 +0100
committerGitHub <noreply@github.com>2018-02-14 23:10:07 +0100
commit9857545446b76a23940bd4d3ab69470e256fe61f (patch)
treef24edc4c63cba30d0075a8641693daf4357088d4 /nixos
parent16fa6f59f77fd635665ba719e278bc673ceb1d9e (diff)
parent7713889556b013ef109c35be7fccb378a4f13b6d (diff)
downloadnixlib-9857545446b76a23940bd4d3ab69470e256fe61f.tar
nixlib-9857545446b76a23940bd4d3ab69470e256fe61f.tar.gz
nixlib-9857545446b76a23940bd4d3ab69470e256fe61f.tar.bz2
nixlib-9857545446b76a23940bd4d3ab69470e256fe61f.tar.lz
nixlib-9857545446b76a23940bd4d3ab69470e256fe61f.tar.xz
nixlib-9857545446b76a23940bd4d3ab69470e256fe61f.tar.zst
nixlib-9857545446b76a23940bd4d3ab69470e256fe61f.zip
Merge pull request #34979 from jtojnar/gjs-1.50.4
gnome3.gjs: 1.50.2 → 1.50.4 
Diffstat (limited to 'nixos')
-rw-r--r--nixos/release.nix1
-rw-r--r--nixos/tests/gjs.nix19
2 files changed, 20 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix
index 4cae07dd99ac..984bf8ef0862 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -260,6 +260,7 @@ in rec {
   tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
+  tests.gjs = callTest tests/gjs.nix {};
   tests.gocd-agent = callTest tests/gocd-agent.nix {};
   tests.gocd-server = callTest tests/gocd-server.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
diff --git a/nixos/tests/gjs.nix b/nixos/tests/gjs.nix
new file mode 100644
index 000000000000..e6002ef98dd0
--- /dev/null
+++ b/nixos/tests/gjs.nix
@@ -0,0 +1,19 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "gjs";
+
+  meta = {
+    maintainers = pkgs.gnome3.gjs.meta.maintainers;
+  };
+
+  machine = { pkgs, ... }: {
+    imports = [ ./common/x11.nix ];
+    environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+    environment.variables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gjs.installedTests}/share" ];
+  };
+
+  testScript = ''
+    $machine->waitForX;
+    $machine->succeed("gnome-desktop-testing-runner");
+  '';
+})