Ensure all functional scripts are (a) executable (b) have shebang

This is good for shebang, and also good for future build system
simplifications
This commit is contained in:
John Ericson 2024-05-28 12:43:04 -04:00
parent 2e12b58126
commit 10f864c5ae
136 changed files with 253 additions and 0 deletions

2
tests/functional/add.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
path1=$(nix-store --add ./dummy) path1=$(nix-store --add ./dummy)

2
tests/functional/bash-profile.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh

2
tests/functional/binary-cache-build-remote.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/binary-cache.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
needLocalStore "'--no-require-sigs' cant be used with the daemon" needLocalStore "'--no-require-sigs' cant be used with the daemon"

2
tests/functional/brotli.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/build-delete.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/build-dry.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
################################################### ###################################################

View File

View File

0
tests/functional/build-remote-input-addressed.sh Normal file → Executable file
View File

View File

View File

View File

View File

View File

0
tests/functional/build-remote-with-mounted-ssh-ng.sh Normal file → Executable file
View File

2
tests/functional/build.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/case-hack.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/check-refs.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/check-reqs.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/check.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# XXX: This shouldnt be, but #4813 cause this test to fail # XXX: This shouldnt be, but #4813 cause this test to fail

2
tests/functional/chroot-store.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
echo example > $TEST_ROOT/example.txt echo example > $TEST_ROOT/example.txt

2
tests/functional/completions.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
cd "$TEST_ROOT" cd "$TEST_ROOT"

2
tests/functional/compression-levels.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/compute-levels.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
if [[ $(uname -ms) = "Linux x86_64" ]]; then if [[ $(uname -ms) = "Linux x86_64" ]]; then

2
tests/functional/config.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Isolate the home for this test. # Isolate the home for this test.

2
tests/functional/db-migration.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
# Test that we can successfully migrate from an older db schema # Test that we can successfully migrate from an older db schema
source common.sh source common.sh

2
tests/functional/debugger.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/dependencies.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/derivation-json.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
drvPath=$(nix-instantiate simple.nix) drvPath=$(nix-instantiate simple.nix)

2
tests/functional/dump-db.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
needLocalStore "--dump-db requires a local store" needLocalStore "--dump-db requires a local store"

2
tests/functional/eval-store.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Using `--eval-store` with the daemon will eventually copy everything # Using `--eval-store` with the daemon will eventually copy everything

2
tests/functional/eval.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/experimental-features.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Skipping these two for now, because we actually *do* want flags and # Skipping these two for now, because we actually *do* want flags and

2
tests/functional/export-graph.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/export.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/extra-sandbox-profile.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
if [[ $(uname) != Darwin ]]; then skipTest "Need Darwin"; fi if [[ $(uname) != Darwin ]]; then skipTest "Need Darwin"; fi

2
tests/functional/fetchClosure.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
enableFeatures "fetch-closure" enableFeatures "fetch-closure"

2
tests/functional/fetchGit.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
requireGit requireGit

2
tests/functional/fetchGitRefs.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
requireGit requireGit

2
tests/functional/fetchGitSubmodules.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
set -u set -u

2
tests/functional/fetchGitVerification.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
requireGit requireGit

2
tests/functional/fetchMercurial.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
[[ $(type -p hg) ]] || skipTest "Mercurial not installed" [[ $(type -p hg) ]] || skipTest "Mercurial not installed"

2
tests/functional/fetchPath.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
touch $TEST_ROOT/foo -t 202211111111 touch $TEST_ROOT/foo -t 202211111111

2
tests/functional/fetchTree-file.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/fetchurl.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/filter-source.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
rm -rf $TEST_ROOT/filterin rm -rf $TEST_ROOT/filterin

2
tests/functional/fixed.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/flakes/absolute-attr-paths.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
flake1Dir=$TEST_ROOT/flake1 flake1Dir=$TEST_ROOT/flake1

2
tests/functional/flakes/absolute-paths.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
requireGit requireGit

2
tests/functional/flakes/build-paths.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
flake1Dir=$TEST_ROOT/flake1 flake1Dir=$TEST_ROOT/flake1

2
tests/functional/flakes/bundle.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
cp ../simple.nix ../simple.builder.sh ../config.nix $TEST_HOME cp ../simple.nix ../simple.builder.sh ../config.nix $TEST_HOME

2
tests/functional/flakes/check.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
flakeDir=$TEST_ROOT/flake3 flakeDir=$TEST_ROOT/flake3

2
tests/functional/flakes/circular.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
# Test circular flake dependencies. # Test circular flake dependencies.
source ./common.sh source ./common.sh

2
tests/functional/flakes/config.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
cp ../simple.nix ../simple.builder.sh ../config.nix $TEST_HOME cp ../simple.nix ../simple.builder.sh ../config.nix $TEST_HOME

2
tests/functional/flakes/develop.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ../common.sh source ../common.sh
clearStore clearStore

2
tests/functional/flakes/flake-in-submodule.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Tests that: # Tests that:

2
tests/functional/flakes/flakes.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
requireGit requireGit

2
tests/functional/flakes/follow-paths.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
requireGit requireGit

2
tests/functional/flakes/init.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
requireGit requireGit

2
tests/functional/flakes/inputs.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
requireGit requireGit

2
tests/functional/flakes/mercurial.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
[[ $(type -p hg) ]] || skipTest "Mercurial not installed" [[ $(type -p hg) ]] || skipTest "Mercurial not installed"

2
tests/functional/flakes/prefetch.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Test symlinks in zip files (#10649). # Test symlinks in zip files (#10649).

2
tests/functional/flakes/run.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ../common.sh source ../common.sh
clearStore clearStore

2
tests/functional/flakes/search-root.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/flakes/show.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
flakeDir=$TEST_ROOT/flake flakeDir=$TEST_ROOT/flake

2
tests/functional/flakes/unlocked-override.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source ./common.sh source ./common.sh
requireGit requireGit

2
tests/functional/fmt.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
set +x set +x

2
tests/functional/gc-auto.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
needLocalStore "“min-free” and “max-free” are daemon options" needLocalStore "“min-free” and “max-free” are daemon options"

2
tests/functional/gc-concurrent.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/gc-non-blocking.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
# Test whether the collector is non-blocking, i.e. a build can run in # Test whether the collector is non-blocking, i.e. a build can run in
# parallel with it. # parallel with it.
source common.sh source common.sh

2
tests/functional/gc-runtime.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
case $system in case $system in

2
tests/functional/gc.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/hash-convert.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Conversion with `nix hash` `nix-hash` and `nix hash convert` # Conversion with `nix hash` `nix-hash` and `nix hash convert`

2
tests/functional/hash-path.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
try () { try () {

2
tests/functional/help.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/import-derivation.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/impure-derivations.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
requireDaemonNewerThan "2.8pre20220311" requireDaemonNewerThan "2.8pre20220311"

2
tests/functional/impure-env.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Needs the config option 'impure-env' to work # Needs the config option 'impure-env' to work

2
tests/functional/impure-eval.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
export REMOTE_STORE="dummy://" export REMOTE_STORE="dummy://"

2
tests/functional/lang-test-infra.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
# Test the function for lang.sh # Test the function for lang.sh
source common.sh source common.sh

View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
set -o pipefail set -o pipefail

2
tests/functional/legacy-ssh-store.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
store_uri="ssh://localhost?remote-store=$TEST_ROOT/other-store" store_uri="ssh://localhost?remote-store=$TEST_ROOT/other-store"

2
tests/functional/linux-sandbox.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
needLocalStore "the sandbox only runs on the builder side, so it makes no sense to test it with the daemon" needLocalStore "the sandbox only runs on the builder side, so it makes no sense to test it with the daemon"

2
tests/functional/logging.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/misc.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# Tests miscellaneous commands. # Tests miscellaneous commands.

2
tests/functional/multiple-outputs.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/nar-access.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
echo "building test path" echo "building test path"

2
tests/functional/nested-sandboxing.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
# This test is run by `tests/functional/nested-sandboxing/runner.nix` in an extra layer of sandboxing. # This test is run by `tests/functional/nested-sandboxing/runner.nix` in an extra layer of sandboxing.
[[ -d /nix/store ]] || skipTest "running this test without Nix's deps being drawn from /nix/store is not yet supported" [[ -d /nix/store ]] || skipTest "running this test without Nix's deps being drawn from /nix/store is not yet supported"

2
tests/functional/nix-build.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/nix-channel.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearProfiles clearProfiles

2
tests/functional/nix-collect-garbage-d.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/nix-copy-ssh-ng.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
source nix-copy-ssh-common.sh "ssh-ng" source nix-copy-ssh-common.sh "ssh-ng"

2
tests/functional/nix-copy-ssh.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
source nix-copy-ssh-common.sh "ssh" source nix-copy-ssh-common.sh "ssh"

2
tests/functional/nix-profile.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/nix-shell.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/nix_path.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
# Regression for https://github.com/NixOS/nix/issues/5998 and https://github.com/NixOS/nix/issues/5980 # Regression for https://github.com/NixOS/nix/issues/5998 and https://github.com/NixOS/nix/issues/5980
source common.sh source common.sh

2
tests/functional/optimise-store.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
clearStore clearStore

2
tests/functional/output-normalization.sh Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
testNormalization () { testNormalization () {

Some files were not shown because too many files have changed in this diff Show More