mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuse: Add more consistent SKIP_* environment variables.

Browse Source 
The new behaviour is as follows:

Skip all of the fuse tests:

  SKIP_TEST_FUSE_SH=1

Individual tests can be skipped by setting:

  SKIP_TEST_FUSE_UMOUNT_RACE_SH=1
  SKIP_TEST_GUESTMOUNT_FD=1
  SKIP_TEST_GUESTUNMOUNT_FD=1
  SKIP_TEST_GUESTUNMOUNT_NOT_MOUNTED_SH=1
This commit is contained in:
Richard W.M. Jones
2015-05-12 11:48:44 +01:00
parent 41df8a2c46
commit 96a02f0864
4 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fuse/test-fuse-umount-race.sh
View File

@@ -28,6 +28,11 @@ if [ -n "$SKIP_TEST_FUSE_SH" ]; then
exit 77
fi
if [ -n "$SKIP_TEST_FUSE_UMOUNT_RACE_SH" ]; then
echo "$0: test skipped because environment variable is set."
exit 77
fi
if [ ! -w /dev/fuse ]; then
echo "$0: test skipped because there is no /dev/fuse."
exit 77

7
fuse/test-guestmount-fd.c
View File

@@ -49,6 +49,13 @@ main (int argc, char *argv[])
int r, status;
/* Allow the test to be skipped. */
skip = getenv ("SKIP_TEST_FUSE");
if (skip && guestfs_int_is_true (skip) > 0) {
fprintf (stderr, "%s: test skipped because environment variable set.\n",
guestfs_int_program_name);
exit (77);
}
skip = getenv ("SKIP_TEST_GUESTMOUNT_FD");
if (skip && guestfs_int_is_true (skip) > 0) {
fprintf (stderr, "%s: test skipped because environment variable set.\n",

16
fuse/test-guestunmount-fd.c
View File

@@ -39,10 +39,26 @@
int
main (int argc, char *argv[])
{
char *skip;
int pipefd[2];
pid_t pid;
int r, status;
/* Allow the test to be skipped. */
skip = getenv ("SKIP_TEST_FUSE");
if (skip && guestfs_int_is_true (skip) > 0) {
fprintf (stderr, "%s: test skipped because environment variable set.\n",
guestfs_int_program_name);
exit (77);
}
skip = getenv ("SKIP_TEST_GUESTUNMOUNT_FD");
if (skip && guestfs_int_is_true (skip) > 0) {
fprintf (stderr, "%s: test skipped because environment variable set.\n",
guestfs_int_program_name);
exit (77);
}
/* Create the pipe. */
if (pipe (pipefd) == -1) {
perror ("pipe");

5
fuse/test-guestunmount-not-mounted.sh
View File

@@ -24,6 +24,11 @@ unset CDPATH
#set -e
#set -v
if [ -n "$SKIP_TEST_FUSE_SH" ]; then
echo "$0: test skipped because environment variable is set."
exit 77
fi
if [ -n "$SKIP_TEST_GUESTUNMOUNT_NOT_MOUNTED_SH" ]; then
echo "$0: test skipped because environment variable is set."
exit 77