diff options
| author | Judson <nyarly@gmail.com> | 2017-07-02 17:18:58 -0700 |
|---|---|---|
| committer | Judson <nyarly@gmail.com> | 2017-07-02 17:18:58 -0700 |
| commit | 0641253ae66d748b5ff0562c4edba3f9502a38e3 (patch) | |
| tree | 3b636a598821de054cf5413457f23aca6604683e /pkgs | |
| parent | e149f0234451e6ac714492076e5796546a2b035b (diff) | |
| download | nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.tar nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.tar.gz nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.tar.bz2 nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.tar.lz nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.tar.xz nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.tar.zst nixpkgs-0641253ae66d748b5ff0562c4edba3f9502a38e3.zip | |
Small changes in response to review.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/ruby-modules/bundled-common/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/development/ruby-modules/runtests.sh | 2 | ||||
| -rw-r--r-- | 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 09eb36a247a..1bf6257f655 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 d0faaf971db..8bb8c8a5462 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 <nixpkgs> {}; 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 555ce89d833..74fcceebaa0 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"; |