Fix make syntax-check
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
1 parent
96d12b3f68
commit
82d4e7fe68
7 files changed
+14
-31
No files matched your search
@@ -41,14 +41,6 @@ echo "ok shortened checksum"
|
||||
(cd repo && ${CMD_PREFIX} ostree rev-parse test2)
|
||||
echo "ok repo-in-cwd"
|
||||
|
||||
$OSTREE refs > reflist
|
||||
assert_file_has_content reflist '^test2$'
|
||||
rm reflist
|
||||
|
||||
$OSTREE refs --delete 2>/dev/null && (echo 1>&2 "refs --delete (without prefix) unexpectedly succeeded!"; exit 1)
|
||||
|
||||
echo "ok refs"
|
||||
|
||||
cd checkout-test2
|
||||
assert_has_file firstfile
|
||||
assert_has_file baz/cow
|
||||
|
||||
+4
-4
@@ -108,7 +108,7 @@ rm main-files -rf
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo static-delta generate main
|
||||
prev_rev=$(ostree --repo=ostree-srv/gnomerepo rev-parse main^)
|
||||
new_rev=$(ostree --repo=ostree-srv/gnomerepo rev-parse main)
|
||||
ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
|
||||
cd ${test_tmpdir}
|
||||
repo_init
|
||||
@@ -159,7 +159,7 @@ echo "ok pull byteswapped delta"
|
||||
|
||||
cd ${test_tmpdir}
|
||||
rm ostree-srv/gnomerepo/deltas -rf
|
||||
ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
repo_init
|
||||
if ${CMD_PREFIX} ostree --repo=repo pull --require-static-deltas origin main 2>err.txt; then
|
||||
assert_not_reached "--require-static-deltas unexpectedly succeeded"
|
||||
@@ -179,7 +179,7 @@ cd ..
|
||||
rm main-files -rf
|
||||
# Generate new delta that we'll use
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo static-delta generate --inline main
|
||||
ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
|
||||
cd ${test_tmpdir}
|
||||
${CMD_PREFIX} ostree --repo=repo pull origin main
|
||||
@@ -203,7 +203,7 @@ ${CMD_PREFIX} ostree --repo=${test_tmpdir}/ostree-srv/gnomerepo commit -b main -
|
||||
cd ..
|
||||
rm main-files -rf
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo static-delta generate main
|
||||
ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
${CMD_PREFIX} ostree --repo=ostree-srv/gnomerepo summary -u
|
||||
|
||||
cd ${test_tmpdir}
|
||||
${CMD_PREFIX} ostree --repo=repo pull origin main
|
||||
|
||||
@@ -33,7 +33,7 @@ cd ${test_tmpdir}
|
||||
${OSTREE} 'export' test2-noxattrs -o test2.tar
|
||||
mkdir t
|
||||
(cd t && tar xf ../test2.tar)
|
||||
ostree --repo=repo diff --no-xattrs test2-noxattrs ./t > diff.txt
|
||||
${CMD_PREFIX} ostree --repo=repo diff --no-xattrs test2-noxattrs ./t > diff.txt
|
||||
assert_file_empty diff.txt
|
||||
rm test2.tar diff.txt t -rf
|
||||
|
||||
@@ -42,9 +42,8 @@ echo 'ok export gnutar diff (no xattrs)'
|
||||
cd ${test_tmpdir}
|
||||
${OSTREE} 'export' test2 -o test2.tar
|
||||
${OSTREE} commit -b test2-from-tar -s 'Import from tar' --tree=tar=test2.tar
|
||||
ostree --repo=repo diff test2 test2-from-tar
|
||||
${CMD_PREFIX} ostree --repo=repo diff test2 test2-from-tar
|
||||
assert_file_empty diff.txt
|
||||
rm test2.tar diff.txt t -rf
|
||||
|
||||
echo 'ok export import'
|
||||
|
||||
@@ -64,11 +64,6 @@ assert_not_has_dir checkout-test2/baz/another
|
||||
|
||||
echo "ok deletion"
|
||||
|
||||
ostree --repo=repo commit -b test2 -s fromfuse --link-checkout-speedup --tree=dir=checkout-test2
|
||||
${CMD_PREFIX} ostree --repo=repo commit -b test2 -s fromfuse --link-checkout-speedup --tree=dir=checkout-test2
|
||||
|
||||
echo "ok commit"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user