vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

tests: suppress use of libmagic when running the regression test suite 

How libmagic will behave is not necessarily stable across different
operating systems of versions of libmagic (or the magic number
database).  So suppress it to avoid false test failures.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
debian
Theodore Ts'o 2016-06-07 12:46:24 -04:00
parent 55e8032363
commit 726b21b5d2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/support/plausible.c
View File

@ -248,7 +248,9 @@ int check_plausibility(const char *device, int flags, int *ret_is_dev)
}
#ifdef HAVE_MAGIC_H
if ((flags & CHECK_FS_EXIST) && magic_library_available()) {
if ((flags & CHECK_FS_EXIST) &&
!getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") &&
magic_library_available()) {
const char *msg;
magic_t mag;
int has_magic = 0;

3
tests/f_detect_junk/expect
View File

@ -11,13 +11,10 @@ is corrupt, and you might try running e2fsck with an alternate superblock:
or
e2fsck -b 32768 <device>
test.img contains `PNG image data, 148 x 31, 8-bit/color RGBA, non-interlaced' data
*** debugfs
test.img: Bad magic number in super-block while opening filesystem
test.img contains `PNG image data, 148 x 31, 8-bit/color RGBA, non-interlaced' data
*** tune2fs
../misc/tune2fs: Bad magic number in super-block while trying to open test.img
test.img contains `PNG image data, 148 x 31, 8-bit/color RGBA, non-interlaced' data
*** mke2fs
Creating filesystem with 16384 1k blocks and 4096 inodes
Superblock backups stored on blocks:

2
tests/test_config
View File

@ -39,3 +39,5 @@ E2FSPROGS_SKIP_PROGRESS=yes
export E2FSPROGS_SKIP_PROGRESS
EXT2FS_NO_MTAB_OK=yes
export EXT2FS_NO_MTAB_OK
E2FSPROGS_LIBMAGIC_SUPPRESS=yes
export E2FSPROGS_LIBMAGIC_SUPPRESS