Commit b5389e2a authored by Robert Hensing's avatar Robert Hensing
Browse files

nixosTests.docker-tools-nix-shell: Enable on aarch64-linux 



The docker-tools test, where this originates, was not run on aarch64-linux, but this is an artifact of its age more so than anything else.

Co-authored-by: default avatarIvan Trubach <mr.trubach@icloud.com>
parent 32c9e319

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ in { 
  docker-rootless = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker-rootless.nix {};

  docker-registry = handleTest ./docker-registry.nix {};

  docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {};

  docker-tools-nix-shell = runTestOn ["x86_64-linux"] ./docker-tools-nix-shell.nix;

  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;

  docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {};

  docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {};

  documize = handleTest ./documize.nix {};

pkgs/build-support/dev-shell-tools/tests/default.nix

+2 −12
Original line number Diff line number Diff line
@@ -13,23 +13,13 @@ let 
    concatLines

    escapeShellArg

    isString

    mapAttrs

    mapAttrsToList

    ;

in

lib.recurseIntoAttrs {



  nixos = lib.recurseIntoAttrs (

    # This should have been a simple optioanlAttrs, but release.nix is very picky.

    # > cannot find attribute `tests.devShellTools.nixos.docker-tools-nix-shell'

    let

      tests = {

        inherit (nixosTests) docker-tools-nix-shell;

      };

    in

    if stdenv.hostPlatform.system == "x86_64-linux" then tests else

      mapAttrs (k: v: emptyFile) tests

  );

  # nix-build -A tests.devShellTools.nixos

  nixos = nixosTests.docker-tools-nix-shell;



  # nix-build -A tests.devShellTools.valueToString

  valueToString =