build: ensure urbit tests are run with the -g argument

This commit is contained in:
Brendan Hay 2020-11-04 20:15:50 +01:00
parent dd782e062e
commit 644acd5002
No known key found for this signature in database
GPG Key ID: 80E915C54A7C457D
3 changed files with 15 additions and 6 deletions

View File

@ -1,4 +1,4 @@
{ stdenvNoCC, cacert }:
{ lib, stdenvNoCC, cacert }:
{ urbit, herb, arvo ? null, pill, ship }:
@ -22,9 +22,13 @@ stdenvNoCC.mkDerivation {
set -xeuo pipefail
if [ -z "$ARVO" ]; then
urbit -d -F "$SHIP" -B "$PILL" ./pier
urbit ${
lib.concatStringsSep " " urbit.meta.arguments
} -d -F "$SHIP" -B "$PILL" ./pier
else
urbit -d -F "$SHIP" -A "$ARVO" -B "$PILL" ./pier
urbit ${
lib.concatStringsSep " " urbit.meta.arguments
} -d -F "$SHIP" -A "$ARVO" -B "$PILL" ./pier
fi
cleanup () {

View File

@ -1,4 +1,4 @@
{ stdenvNoCC, cacert, python3, bootFakeShip }:
{ lib, stdenvNoCC, cacert, python3, bootFakeShip }:
{ urbit, herb, arvo ? null, pill, ship ? "bus", doCheck ? true }:
@ -19,7 +19,9 @@ stdenvNoCC.mkDerivation {
buildPhase = ''
set -x
urbit -d ./pier 2> urbit-output
urbit ${
lib.concatStringsSep " " urbit.meta.arguments
} -d ./pier 2> urbit-output
# Sledge Hammer!
# See: https://github.com/travis-ci/travis-ci/issues/4704#issuecomment-348435959

View File

@ -75,5 +75,8 @@ in stdenv.mkDerivation {
inherit enableParallelBuilding doCheck dontStrip;
meta = { debug = enableDebug; };
meta = {
debug = enableDebug;
arguments = lib.optionals enableDebug [ "-g" ];
};
}