git.iko.soy/typeable/nixpkgs
on master help sign in
appimage-run: add regression test
commitb28e5f3c9a60ac2ae89390660671530221fbfd2a authorGuillaume Girol <symphorien+git@xlumurb.eu> dateMon 4 Jan 2021, 12:00 (6 years ago) parent29f7ba6
3 files changed+33−2
pkgs/tools/package-management/appimage-run/default.nix+3−1 pkgs/tools/package-management/appimage-run/test.nix+24 pkgs/top-level/all-packages.nix+6−1
pkgs/tools/package-management/appimage-run/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }:
1+{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
22
33let
44 fhsArgs = appimageTools.defaultFhsEnvArgs;
@@ -8,4 +8,6 @@ in buildFHSUserEnv (fhsArgs // {
88 targetPkgs = pkgs: [ appimageTools.appimage-exec ]
99 ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
1010 runScript = "appimage-exec.sh";
11+
12+ passthru.tests.appimage-run = appimage-run-tests;
1113})
pkgs/tools/package-management/appimage-run/test.nixnew file+24
@@ -0,0 +1,24 @@
1+{ runCommand, fetchurl, appimage-run, glibcLocales, file }:
2+let
3+ # any AppImage usable on cli, really
4+ sample-appImage = fetchurl {
5+ url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage";
6+ sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r";
7+ };
8+in
9+ runCommand "appimage-run-tests" {
10+ buildInputs = [ appimage-run glibcLocales file ];
11+ meta.platforms = [ "x86_64-linux" ];
12+ }
13+ ''
14+ export HOME=$(mktemp -d)
15+ set -x
16+ # regression test for #101137, must come first
17+ LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage}
18+ # regression test for #108426
19+ cp ${sample-appImage} foo.appImage
20+ LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage
21+ set +x
22+ touch $out
23+ ''
24+
pkgs/top-level/all-packages.nix+6−1
@@ -852,7 +852,12 @@ in
852852 inherit (androidenv.androidPkgs_9_0) build-tools;
853853 };
854854
855− appimage-run = callPackage ../tools/package-management/appimage-run {};
855+ appimage-run = callPackage ../tools/package-management/appimage-run { };
856+ appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
857+ appimage-run = appimage-run.override {
858+ appimage-run-tests = null; /* break boostrap cycle for passthru.tests */
859+ };
860+ };
856861
857862 appimagekit = callPackage ../tools/package-management/appimagekit {};
858863