diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-09-29 18:41:26 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-09-30 15:37:15 -0400 |
| commit | 88d808002dcbcff20847f6c744345058723e08d2 (patch) | |
| tree | 0b0b7e195d1bd792bb1ed3e77ae850ffe55d7c38 /test/test-common.sh | |
| parent | 36c7b060591d5980ceaaa2c58197f0d390ecc8f5 (diff) | |
test: Have $chrootdir be owned by testenv instead of test-common.sh
Diffstat (limited to 'test/test-common.sh')
| -rwxr-xr-x | test/test-common.sh | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/test/test-common.sh b/test/test-common.sh index 45adb8b..bd66fc7 100755 --- a/test/test-common.sh +++ b/test/test-common.sh @@ -43,10 +43,7 @@ after() { } setup_chrootdir() { - if [[ -z "$chrootdir" ]]; then - export chrootdir="$(mktemp -d --tmpdir "test-chrootdir.XXXXXXXXXXXX")" - trap "$(printf '_cleanup_chrootdir %q' "$chrootdir")" EXIT - fi + export chrootdir="${chrootdir:-$TMPDIR/chroots}" _common_before() { mkdir -p "$XDG_CONFIG_HOME"/libretools @@ -58,20 +55,6 @@ setup_chrootdir() { } } -_cleanup_chrootdir() ( - chrootdir=$1 - shopt -s nullglob - if [[ $SUDO ]]; then - if [[ "$(stat -f -c %T "$chrootdir")" == btrfs ]]; then - sudo find "$chrootdir" -depth -inum 256 -exec \ - btrfs subvolume delete {} \; &>/dev/null - fi - sudo rm -rf -- "$chrootdir" - else - rm -rf -- "$chrootdir" - fi -) - require() ( set +x local missing=() |