diff options
| author | William Manley <will@williammanley.net> | 2016-08-31 18:14:19 +0100 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2016-09-01 20:17:58 +0000 |
| commit | 598e3240ff523ca827d225271b6e68da90a5e572 (patch) | |
| tree | ece58dac2e2995761cb59374475f444ada1279ff /tests/test-switchroot.sh | |
| parent | 4d3b93e2ad1041fa36e740cba35284d17752e928 (diff) | |
| download | ostree-598e3240ff523ca827d225271b6e68da90a5e572.tar.gz | |
switchroot: Fix test-switchroot now autotools can build static
This test previously depended on manually building ostree-prepare-root.
Since 42dab85 we've been able to build static binaries with the usual
autotools build-system. This change reflects the fact that
`ostree-prepare-root` is built into $srcdir rather than `src/switchroot`
where I was building manually.
This test now passes with `./configure --with-static-compiler=gcc` (glibc)
but still fails with `./configure --with-static-compiler=musl-gcc` (musl).
Closes: #485
Approved by: cgwalters
Diffstat (limited to 'tests/test-switchroot.sh')
| -rwxr-xr-x | tests/test-switchroot.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-switchroot.sh b/tests/test-switchroot.sh index 17085140..96c849e5 100755 --- a/tests/test-switchroot.sh +++ b/tests/test-switchroot.sh @@ -6,7 +6,7 @@ setup_bootfs() { mkdir -p "$1/proc" "$1/bin" echo "quiet ostree=/ostree/boot.0 ro" >"$1/proc/cmdline" touch "$1/this_is_bootfs" - cp "$(dirname "$this_script")/../src/switchroot/ostree-prepare-root" "$1/bin" + cp "$(dirname "$this_script")/../ostree-prepare-root" "$1/bin" } setup_rootfs() { |