From 97879bb90d12acba027cc9a5d4e0a588429e95d2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 14 Feb 2022 12:03:52 +0100 Subject: [PATCH] Revert "vengi-tools: remove failing roundtrip test" This reverts commit 50dae31a148317bdf892cffb4e6b03d038cb2b49. --- .../applications/graphics/vengi-tools/default.nix | 4 +--- .../vengi-tools/test-voxconvert-roundtrip.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 182f9a4f064..eb5033a4a97 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -87,9 +87,7 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - # There used to be a roundtrip test here, but it started failing on 0.0.17 - # Relevant upstream ticket: - # https://github.com/mgerhardy/vengi/issues/113 + voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix {}; run-voxedit = nixosTests.vengi-tools; }; diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix new file mode 100644 index 00000000000..3d324d2c38d --- /dev/null +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -0,0 +1,15 @@ +{ stdenv +, vengi-tools +}: + +stdenv.mkDerivation { + name = "vengi-tools-test-voxconvert-roundtrip"; + meta.timeout = 10; + buildCommand = '' + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb + ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox + diff chr_knight.vox chr_knight1.vox + touch $out + ''; +}