From 6af2184cfd1a613fea2a40f5b02642fddbd6d727 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 14 Feb 2021 15:32:17 +0100
Subject: pkgs/profpatsch/el-semicolon: build and run tests using
 testRustSimple

---
 pkgs/profpatsch/default.nix          |  3 +--
 pkgs/profpatsch/execline/default.nix | 16 ++++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'pkgs/profpatsch')

diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index 0365d213..c4daf05b 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -256,9 +256,8 @@ in rec {
     record-get
     ;
 
-  inherit (import ./execline/default.nix { inherit pkgs writeRustSimpleLib rust-deps; })
+  inherit (import ./execline/default.nix { inherit pkgs writeRustSimpleLib testRustSimple rust-deps; })
     el-semicolon
-    el-semicolon-tests
     el-exec
     el-substitute
     ;
diff --git a/pkgs/profpatsch/execline/default.nix b/pkgs/profpatsch/execline/default.nix
index 2d930af0..0f0807b5 100644
--- a/pkgs/profpatsch/execline/default.nix
+++ b/pkgs/profpatsch/execline/default.nix
@@ -1,14 +1,11 @@
-{ pkgs, writeRustSimpleLib, rust-deps }:
+{ pkgs, writeRustSimpleLib, testRustSimple, rust-deps }:
 
 let
-  el-semicolon-common = tests: writeRustSimpleLib "el_semicolon" {
-    buildTests = tests;
-    release = false;
-    verbose = true;
-  } ./el_semicolon.rs;
-
-  el-semicolon-tests = el-semicolon-common true;
-  el-semicolon = el-semicolon-common false;
+  el-semicolon = testRustSimple
+    (writeRustSimpleLib "el_semicolon" {
+      release = false;
+      verbose = true;
+    } ./el_semicolon.rs);
 
   el-exec = writeRustSimpleLib "el_exec" {
     dependencies = [ rust-deps.libc ];
@@ -27,7 +24,6 @@ let
 in {
   inherit
     el-semicolon
-    el-semicolon-tests
     el-exec
     el-substitute
     ;
-- 
cgit 1.4.1