[ostree] Fix make syntax-check
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] Fix make syntax-check
- Date: Tue, 1 Mar 2016 15:09:04 +0000 (UTC)
commit 82d4e7fe68595d54e043b4f4429b7e68bd1240a5
Author: Giuseppe Scrivano <gscrivan redhat com>
Date: Mon Feb 29 13:23:28 2016 +0100
Fix make syntax-check
Signed-off-by: Giuseppe Scrivano <gscrivan redhat com>
cfg.mk | 2 +-
manual-tests/static-delta-generate-crosscheck.sh | 1 -
src/rofiles-fuse/main.c | 14 ++++++--------
tests/basic-test.sh | 8 --------
tests/pull-test.sh | 8 ++++----
tests/test-export.sh | 5 ++---
tests/test-rofiles-fuse.sh | 7 +------
7 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/cfg.mk b/cfg.mk
index bdbeb9e..a0ce8fa 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -27,4 +27,4 @@ local-checks-to-skip = \
show-vc-list-except:
@$(VC_LIST_EXCEPT)
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|*.gpg|*.sig$$
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|*.gpg|*.sig|.xz$$
diff --git a/manual-tests/static-delta-generate-crosscheck.sh
b/manual-tests/static-delta-generate-crosscheck.sh
index 4dbaab9..fbcbe67 100755
--- a/manual-tests/static-delta-generate-crosscheck.sh
+++ b/manual-tests/static-delta-generate-crosscheck.sh
@@ -59,4 +59,3 @@ set -x
validate_delta_options
validate_delta_options --inline
validate_delta_options --disable-bsdiff
-
diff --git a/src/rofiles-fuse/main.c b/src/rofiles-fuse/main.c
index 3c910f1..0b0e6a3 100644
--- a/src/rofiles-fuse/main.c
+++ b/src/rofiles-fuse/main.c
@@ -24,10 +24,8 @@
#include <sys/stat.h>
#include <sys/statvfs.h>
#include <stdio.h>
-#include <strings.h>
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/xattr.h>
@@ -227,7 +225,7 @@ callback_symlink (const char *from, const char *to)
{
fprintf (stderr, "Failed to find newly created symlink '%s': %s\n",
to, g_strerror (errno));
- exit (1);
+ exit (EXIT_FAILURE);
}
return 0;
}
@@ -545,7 +543,7 @@ rofs_parse_opt (void *data, const char *arg, int key,
if (basefd == -1)
{
perror ("openat");
- exit (1);
+ exit (EXIT_FAILURE);
}
return 0;
}
@@ -557,10 +555,10 @@ rofs_parse_opt (void *data, const char *arg, int key,
return 1;
case KEY_HELP:
usage (outargs->argv[0]);
- exit (0);
+ exit (EXIT_SUCCESS);
default:
fprintf (stderr, "see `%s -h' for usage\n", outargs->argv[0]);
- exit (1);
+ exit (EXIT_FAILURE);
}
return 1;
}
@@ -584,13 +582,13 @@ main (int argc, char *argv[])
{
fprintf (stderr, "Invalid arguments\n");
fprintf (stderr, "see `%s -h' for usage\n", argv[0]);
- exit (1);
+ exit (EXIT_FAILURE);
}
if (basefd == -1)
{
fprintf (stderr, "Missing basepath\n");
fprintf (stderr, "see `%s -h' for usage\n", argv[0]);
- exit (1);
+ exit (EXIT_FAILURE);
}
created_devino_hash = g_hash_table_new_full (devino_hash, devino_equal, g_free, NULL);
diff --git a/tests/basic-test.sh b/tests/basic-test.sh
index c0487d6..9d62b31 100755
--- a/tests/basic-test.sh
+++ b/tests/basic-test.sh
@@ -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
diff --git a/tests/pull-test.sh b/tests/pull-test.sh
index 9c8b41f..74d4a73 100755
--- a/tests/pull-test.sh
+++ b/tests/pull-test.sh
@@ -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
diff --git a/tests/test-export.sh b/tests/test-export.sh
index 18f2f7a..1e81a2e 100755
--- a/tests/test-export.sh
+++ b/tests/test-export.sh
@@ -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'
-
diff --git a/tests/test-rofiles-fuse.sh b/tests/test-rofiles-fuse.sh
index 24ee264..f621df9 100755
--- a/tests/test-rofiles-fuse.sh
+++ b/tests/test-rofiles-fuse.sh
@@ -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"
-
-
-
-
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]