From 2bc2b175600b6e153b8185e7677caec6135cb066 Mon Sep 17 00:00:00 2001
From: bezmuth <benkel97@protonmail.com>
Date: Fri, 5 Aug 2022 04:03:24 +0100
Subject: [PATCH 1/4] dino: add tests

---
 .../instant-messengers/dino/default.nix       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index fff08699fa82..6db81e442976 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -73,6 +73,26 @@ stdenv.mkDerivation rec {
     libxkbcommon
   ];
 
+  cmakeFlags = ["-DBUILD_TESTS=yes"];
+
+  doCheck = true;
+  checkPhase = ''
+  echo "================= Running built tests ================="
+  set -x
+  ./xmpp-vala-test
+  TEST1=$?
+  ./signal-protocol-vala-test
+  TEST2=$?
+  set +x
+  if [ $TEST1 != 0 ] && [ $TEST2 != 0 ]; then
+    echo "tests failed"
+    exit 1;
+  else
+    echo "tests succeeded"
+  fi
+  echo "================= /Running built tests ================="
+  '';
+
   # Dino looks for plugins with a .so filename extension, even on macOS where
   # .dylib is appropriate, and despite the fact that it builds said plugins with
   # that as their filename extension

From e9a27ca6f6a0810ac91892e373a5fd671ad35e26 Mon Sep 17 00:00:00 2001
From: Ben Kelly <31394095+bezmuth@users.noreply.github.com>
Date: Fri, 5 Aug 2022 06:48:53 +0100
Subject: [PATCH 2/4] Fix the test if statement

---
 .../applications/networking/instant-messengers/dino/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 6db81e442976..1e8f23e189de 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
   ./signal-protocol-vala-test
   TEST2=$?
   set +x
-  if [ $TEST1 != 0 ] && [ $TEST2 != 0 ]; then
+  if [ $TEST1 != 0 ] || [ $TEST2 != 0 ]; then
     echo "tests failed"
     exit 1;
   else

From 3dc237306e8f20b1f8af52efef92abf7530147cc Mon Sep 17 00:00:00 2001
From: bezmuth <benkel97@protonmail.com>
Date: Mon, 15 Aug 2022 13:37:55 +0100
Subject: [PATCH 3/4] dino: simplify checkPhase

---
 .../instant-messengers/dino/default.nix       | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 1e8f23e189de..3cee984d95d6 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -77,20 +77,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkPhase = ''
-  echo "================= Running built tests ================="
-  set -x
-  ./xmpp-vala-test
-  TEST1=$?
-  ./signal-protocol-vala-test
-  TEST2=$?
-  set +x
-  if [ $TEST1 != 0 ] || [ $TEST2 != 0 ]; then
-    echo "tests failed"
-    exit 1;
-  else
-    echo "tests succeeded"
-  fi
-  echo "================= /Running built tests ================="
+    runHook preCheck
+    set -e
+    ./xmpp-vala-test
+    ./signal-protocol-vala-test
+    runHook postCheck
   '';
 
   # Dino looks for plugins with a .so filename extension, even on macOS where

From 301f549df96145c2220e947f2a1f3c16aa6c6bdc Mon Sep 17 00:00:00 2001
From: Ben Kelly <31394095+bezmuth@users.noreply.github.com>
Date: Tue, 16 Aug 2022 15:12:14 +0100
Subject: [PATCH 4/4] Update default.nix

---
 pkgs/applications/networking/instant-messengers/dino/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 3cee984d95d6..d18341b220f4 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = ''
     runHook preCheck
-    set -e
     ./xmpp-vala-test
     ./signal-protocol-vala-test
     runHook postCheck