summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-06 18:20:26 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-08-06 19:13:35 -0400
commit087c640e1aa8ae9bf06931ebbf31ad4a91ce7293 (patch)
tree5257407b0746b95e0d733a4250d9fc510bc8b51c
parentf3ea1c8238bea544eac14607ac3bdee386718bce (diff)
downloadnixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.tar
nixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.tar.gz
nixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.tar.bz2
nixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.tar.lz
nixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.tar.xz
nixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.tar.zst
nixpkgs-087c640e1aa8ae9bf06931ebbf31ad4a91ce7293.zip
nixosTests.gnome3-xorg: rename from gnome3
-rw-r--r--nixos/release-combined.nix2
-rw-r--r--nixos/tests/all-tests.nix2
-rw-r--r--nixos/tests/gnome3-xorg.nix (renamed from nixos/tests/gnome3.nix)2
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index b9a9515f94e..9b150f12eec 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -68,7 +68,7 @@ in rec {
         nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
-        (except ["aarch64-linux"] nixos.tests.gnome3)
+        (except ["aarch64-linux"] nixos.tests.gnome3-xorg)
         (except ["aarch64-linux"] nixos.tests.pantheon)
         nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
         (except ["aarch64-linux"] nixos.tests.installer.lvm)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index c3fa53ac544..d49853825aa 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -93,7 +93,7 @@ in
   gitlab = handleTest ./gitlab.nix {};
   gitolite = handleTest ./gitolite.nix {};
   gjs = handleTest ./gjs.nix {};
-  gnome3 = handleTestOn ["x86_64-linux"] ./gnome3.nix {}; # libsmbios is unsupported on aarch64
+  gnome3-xorg = handleTestOn ["x86_64-linux"] ./gnome3-xorg.nix {}; # libsmbios is unsupported on aarch64
   gnome3-gdm = handleTestOn ["x86_64-linux"] ./gnome3-gdm.nix {}; # libsmbios is unsupported on aarch64
   gocd-agent = handleTest ./gocd-agent.nix {};
   gocd-server = handleTest ./gocd-server.nix {};
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3-xorg.nix
index b58c9e5a0e3..ae34b6d22b0 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3-xorg.nix
@@ -1,5 +1,5 @@
 import ./make-test.nix ({ pkgs, ...} : {
-  name = "gnome3";
+  name = "gnome3-xorg";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ domenkozar eelco lethalman ];
   };