diff options
| -rwxr-xr-x | src/nix-build/nix-build.cc | 3 | ||||
| -rw-r--r-- | tests/local.mk | 2 | ||||
| -rw-r--r-- | tests/nix-shell.sh | 21 | ||||
| -rw-r--r-- | tests/shell.nix | 46 | ||||
| -rwxr-xr-x | tests/shell.shebang.sh | 4 |
5 files changed, 74 insertions, 2 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc index 08c679357..ef959fa00 100755 --- a/src/nix-build/nix-build.cc +++ b/src/nix-build/nix-build.cc @@ -117,7 +117,7 @@ int main(int argc, char ** argv) inShebang = true; for (int i = 2; i < argc - 1; ++i) savedArgs.push_back(argv[i]); - std::vector<string> args; + args.clear(); for (auto line : lines) { line = chomp(line); std::smatch match; @@ -276,6 +276,7 @@ int main(int argc, char ** argv) if (n >= args.size()) { throw UsageError(format("%1% requires an argument") % arg); } + interactive = false; auto interpreter = args[n]; auto execArgs = ""; diff --git a/tests/local.mk b/tests/local.mk index 2ca52144b..b3ce39cda 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -11,7 +11,7 @@ nix_tests = \ multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \ binary-cache.sh nix-profile.sh repair.sh dump-db.sh case-hack.sh \ check-reqs.sh pass-as-file.sh tarball.sh restricted.sh \ - placeholders.sh + placeholders.sh nix-shell.sh # parallel.sh install-tests += $(foreach x, $(nix_tests), tests/$(x)) diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh new file mode 100644 index 000000000..12a0ecd03 --- /dev/null +++ b/tests/nix-shell.sh @@ -0,0 +1,21 @@ +source common.sh + +clearStore + +# Test nix-shell -A +export IMPURE_VAR=foo +output=$(nix-shell --pure shell.nix -A shellDrv --run \ + 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') + +[ "$output" = " - foo - bar" ] + +# Test nix-shell -p +output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo bar --run 'echo "$(foo) $(bar)"') +[ "$output" = "foo bar" ] + +# Test nix-shell shebang mode +sed -e "s|@ENV_PROG@|$(type -p env)|" shell.shebang.sh > $TEST_ROOT/shell.shebang.sh +chmod a+rx $TEST_ROOT/shell.shebang.sh + +output=$($TEST_ROOT/shell.shebang.sh) +[ "$output" = "foo bar" ] diff --git a/tests/shell.nix b/tests/shell.nix new file mode 100644 index 000000000..ed4d6fbaa --- /dev/null +++ b/tests/shell.nix @@ -0,0 +1,46 @@ +{ }: + +with import ./config.nix; + +rec { + setupSh = builtins.toFile "setup" '' + export VAR_FROM_STDENV_SETUP=foo + for pkg in $buildInputs; do + export PATH=$PATH:$pkg/bin + done + ''; + + stdenv = mkDerivation { + name = "stdenv"; + buildCommand = '' + mkdir -p $out + ln -s ${setupSh} $out/setup + ''; + }; + + shellDrv = mkDerivation { + name = "shellDrv"; + builder = "/does/not/exist"; + VAR_FROM_NIX = "bar"; + inherit stdenv; + }; + + # Used by nix-shell -p + runCommand = name: args: buildCommand: mkDerivation (args // { + inherit name buildCommand stdenv; + }); + + foo = runCommand "foo" {} '' + mkdir -p $out/bin + echo 'echo foo' > $out/bin/foo + chmod a+rx $out/bin/foo + ''; + + bar = runCommand "bar" {} '' + mkdir -p $out/bin + echo 'echo bar' > $out/bin/bar + chmod a+rx $out/bin/bar + ''; + + bash = shell; +} diff --git a/tests/shell.shebang.sh b/tests/shell.shebang.sh new file mode 100755 index 000000000..544e28217 --- /dev/null +++ b/tests/shell.shebang.sh @@ -0,0 +1,4 @@ +#! @ENV_PROG@ nix-shell +#! nix-shell -I nixpkgs=shell.nix --option use-binary-caches false +#! nix-shell --pure -i bash -p foo bar +echo "$(foo) $(bar)" |