diff options
| author | Alexander Larsson <alexl@redhat.com> | 2017-01-12 00:04:36 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2017-01-12 00:04:36 +0100 |
| commit | 0fb2f362a8fb23dc14deee67e2d04bea1334cc6e (patch) | |
| tree | d48329154a164d6a799b170b7ddc9b592a68f014 /tests/test-run.sh | |
| parent | 4c686332a3e2d251419d780548885e6c2f7b37de (diff) | |
| download | flatpak-0fb2f362a8fb23dc14deee67e2d04bea1334cc6e.tar.gz | |
tests: Move the test repo to a subdirectory (repos/test)
This makes the ostree trivial-httpd --autoexit feature work better,
because it seems to exit whenever the root directory changes (i.e. not
only when its deleted).
This means the root dir can't be the repo (because then we can't
update the repo), or the base testdir (because we create files there
too), so instead we make the repo $testdir/repos/test and
$testdir/repos as the httpd root.
Diffstat (limited to 'tests/test-run.sh')
| -rwxr-xr-x | tests/test-run.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/test-run.sh b/tests/test-run.sh index 8910dfba..0a8d59b9 100755 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -220,7 +220,7 @@ echo "d" > ${DIR}/files/d/data echo "nope" > ${DIR}/files/nope ${FLATPAK} build-finish --command=hello.sh ${DIR} -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} update_repo ${FLATPAK} ${U} install test-repo org.test.Split --subpath=/a --subpath=/b --subpath=/nosuchdir master @@ -246,7 +246,7 @@ mkdir -p ${DIR}/files/f echo "f" > ${DIR}/files/f/data rm -rf ${DIR}/files/b -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} update_repo ${FLATPAK} ${U} update --subpath=/a --subpath=/b --subpath=/e --subpath=/nosuchdir org.test.Split @@ -266,7 +266,7 @@ assert_has_file $FL_DIR/app/org.test.Split/$ARCH/master/active/files/e/data assert_not_has_file $FL_DIR/app/org.test.Split/$ARCH/master/active/files/f assert_not_has_file $FL_DIR/app/org.test.Split/$ARCH/master/active/files/nope -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} update_repo # Test reusing the old subpath list @@ -294,15 +294,15 @@ VERSION=`cat "$test_builddir/package_version.txt"` DIR=`mktemp -d` ${FLATPAK} build-init ${DIR} org.test.CurrentVersion org.test.Platform org.test.Platform ${FLATPAK} build-finish --require-version=${VERSION} --command=hello.sh ${DIR} -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} DIR=`mktemp -d` ${FLATPAK} build-init ${DIR} org.test.OldVersion org.test.Platform org.test.Platform ${FLATPAK} build-finish --require-version=0.6.10 --command=hello.sh ${DIR} -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} DIR=`mktemp -d` ${FLATPAK} build-init ${DIR} org.test.NewVersion org.test.Platform org.test.Platform ${FLATPAK} build-finish --require-version=${VERSION}9 --command=hello.sh ${DIR} -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} update_repo @@ -313,14 +313,14 @@ ${FLATPAK} ${U} install test-repo org.test.CurrentVersion master DIR=`mktemp -d` ${FLATPAK} build-init ${DIR} org.test.OldVersion org.test.Platform org.test.Platform ${FLATPAK} build-finish --require-version=99.0.0 --command=hello.sh ${DIR} -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} (! ${FLATPAK} ${U} update org.test.OldVersion) DIR=`mktemp -d` ${FLATPAK} build-init ${DIR} org.test.OldVersion org.test.Platform org.test.Platform ${FLATPAK} build-finish --require-version=0.1.1 --command=hello.sh ${DIR} -${FLATPAK} build-export ${FL_GPGARGS} repo ${DIR} +${FLATPAK} build-export ${FL_GPGARGS} repos/test ${DIR} ${FLATPAK} ${U} update org.test.OldVersion |