From 0641253ae66d748b5ff0562c4edba3f9502a38e3 Mon Sep 17 00:00:00 2001 From: Judson Date: Sun, 2 Jul 2017 17:18:58 -0700 Subject: [PATCH] Small changes in response to review. --- pkgs/development/ruby-modules/bundled-common/default.nix | 2 +- pkgs/development/ruby-modules/runtests.sh | 2 +- pkgs/development/ruby-modules/testing/tap-support.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 09eb36a247a4..1bf6257f6559 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -140,7 +140,7 @@ let name = "${pname}-interactive-environment"; nativeBuildInputs = [ wrappedRuby basicEnv ]; shellHook = '' - export OLD_IRBRC="$IRBRC" + export OLD_IRBRC=$IRBRC export IRBRC=${irbrc} ''; buildCommand = '' diff --git a/pkgs/development/ruby-modules/runtests.sh b/pkgs/development/ruby-modules/runtests.sh index d0faaf971dba..8bb8c8a5462c 100755 --- a/pkgs/development/ruby-modules/runtests.sh +++ b/pkgs/development/ruby-modules/runtests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -o xtrace -pwd +cd $(dirname $0) find . -name text.nix testfiles=$(find . -name test.nix) nix-build -E "with import {}; callPackage testing/driver.nix { testFiles = [ $testfiles ]; }" --show-trace && cat result diff --git a/pkgs/development/ruby-modules/testing/tap-support.nix b/pkgs/development/ruby-modules/testing/tap-support.nix index 555ce89d8332..74fcceebaa04 100644 --- a/pkgs/development/ruby-modules/testing/tap-support.nix +++ b/pkgs/development/ruby-modules/testing/tap-support.nix @@ -5,8 +5,8 @@ let testLine = report: "${okStr report} ${toString (report.index + 1)} ${report.description}" + testDirective report + testYaml report; # These are part of the TAP spec, not yet implemented. + #c.f. https://github.com/NixOS/nixpkgs/issues/27071 testDirective = report: ""; - testYaml = report: ""; okStr = { result, ...}: if result == "pass" then "ok" else "not ok";