diff options
| author | Lana Black <lanablack@amok.cc> | 2023-02-11 12:07:01 +0000 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2023-02-11 11:02:13 -0600 |
| commit | 68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73 (patch) | |
| tree | 0a1f18fd0d43cc22b6e616f2ed821c9f3350f25c /pkgs/os-specific/solo5 | |
| parent | eb4b6ca2facd25eaea59e4771a4ee1b31b09c4a3 (diff) | |
| download | nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.tar nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.tar.gz nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.tar.bz2 nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.tar.lz nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.tar.xz nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.tar.zst nixpkgs-68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73.zip | |
solo5: fix tests
Diffstat (limited to 'pkgs/os-specific/solo5')
| -rw-r--r-- | pkgs/os-specific/solo5/0001-Fix-test.patch | 25 | ||||
| -rw-r--r-- | pkgs/os-specific/solo5/default.nix | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/os-specific/solo5/0001-Fix-test.patch b/pkgs/os-specific/solo5/0001-Fix-test.patch new file mode 100644 index 00000000000..bd01c129bec --- /dev/null +++ b/pkgs/os-specific/solo5/0001-Fix-test.patch @@ -0,0 +1,25 @@ +From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001 +From: Lana Black <lana@illuminati.industries> +Date: Sat, 11 Feb 2023 11:53:21 +0000 +Subject: [PATCH] Fix test. + +--- + tests/tests.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tests.bats b/tests/tests.bats +index c542b7a..98520ee 100644 +--- a/tests/tests.bats ++++ b/tests/tests.bats +@@ -196,7 +196,7 @@ xen_expect_abort() { + run test_hello/test_hello.hvt + case "${CONFIG_HOST}" in + Linux) +- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]] ++ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]]) + ;; + FreeBSD) + # XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not +-- +2.39.0 + diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index c449e46a998..c436f247866 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; + patches = [ ./0001-Fix-test.patch ]; + hardeningEnable = [ "pie" ]; configurePhase = '' |