diff options
author | Theodore Ts'o <tytso@mit.edu> | 2014-09-11 12:40:43 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2014-09-11 12:40:43 -0400 |
commit | 330cebc0e95aa8d81477a63932381bcc84eea3c1 (patch) | |
tree | 4cc8557bc47e7bbe35a66bce49b785c5f475c8f5 | |
parent | b874d24629aa132d74a96134ec8eae4773a3c0ce (diff) | |
parent | e426e06afadd98a85fc668d78c8edea8c2501977 (diff) | |
download | e2fsprogs-330cebc0e95aa8d81477a63932381bcc84eea3c1.tar.gz |
Merge branch 'maint' into next
Conflicts:
debugfs/debugfs.c
e2fsck/Makefile.in
lib/ext2fs/Makefile.in
tests/test_config
-rw-r--r-- | MCONFIG.in | 1 | ||||
-rw-r--r-- | e2fsck/Makefile.in | 21 | ||||
-rw-r--r-- | e2fsck/dirinfo.c | 4 | ||||
-rw-r--r-- | e2fsck/dx_dirinfo.c | 4 | ||||
-rw-r--r-- | lib/et/compile_et.sh.in | 2 | ||||
-rw-r--r-- | lib/ext2fs/Makefile.in | 57 | ||||
-rw-r--r-- | lib/ss/Makefile.in | 4 | ||||
-rw-r--r-- | resize/Makefile.in | 3 | ||||
-rw-r--r-- | tests/test_config | 4 |
9 files changed, 53 insertions, 47 deletions
@@ -123,6 +123,7 @@ DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ DEPLIBUUID = @DEPLIBUUID@ DEPLIBQUOTA = @DEPSTATIC_LIBQUOTA@ DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID) +TESTENV = LD_LIBRARY_PATH="$(LIB):$${LD_LIBRARY_PATH}" DYLD_LIBRARY_PATH="$(LIB):$${DYLD_LIBRARY_PATH}" STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@ STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@ diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index c40b188b..cf044b13 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -128,35 +128,36 @@ e2fsck.profiled: $(OBJS) $(PROFILED_DEPLIBS) tst_sigcatcher: $(srcdir)/sigcatcher.c sigcatcher.o $(E) " CC $@" - $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) $(RDYNAMIC) \ + $(Q) $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(RDYNAMIC) \ $(srcdir)/sigcatcher.c -DDEBUG -o tst_sigcatcher tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS) \ $(DEPLIBCOM_ERR) - $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \ + $(Q) $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o tst_problem \ $(srcdir)/problem.c -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) \ $(LIBINTL) $(SYSLIBS) tst_refcount: ea_refcount.c $(DEPLIBCOM_ERR) $(E) " LD $@" $(Q) $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS) \ - $(SYSLIBS) + $(ALL_CFLAGS) $(ALL_LDFLAGS) -DTEST_PROGRAM \ + $(LIBCOM_ERR) $(LIBEXT2FS) $(SYSLIBS) tst_logfile: $(srcdir)/logfile.c $(E) " LD $@" - $(Q) $(CC) -o tst_logfile $(srcdir)/logfile.c $(ALL_CFLAGS) \ - -DTEST_PROGRAM $(SYSLIBS) + $(Q) $(CC) -o tst_logfile $(srcdir)/logfile.c \ + $(ALL_CFLAGS) $(ALL_LDFLAGS) -DTEST_PROGRAM $(SYSLIBS) tst_region: region.c $(DEPLIBCOM_ERR) $(E) " LD $@" $(Q) $(CC) -o tst_region $(srcdir)/region.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(SYSLIBS) + $(ALL_CFLAGS) $(ALL_LDFLAGS) -DTEST_PROGRAM \ + $(LIBCOM_ERR) $(SYSLIBS) check:: tst_refcount tst_region tst_problem - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_refcount - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_region - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_problem + $(TESTENV) ./tst_refcount + $(TESTENV) ./tst_region + $(TESTENV) ./tst_problem extend: extend.o $(E) " LD $@" diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c index dbaf4712..4a9019b5 100644 --- a/e2fsck/dirinfo.c +++ b/e2fsck/dirinfo.c @@ -140,6 +140,10 @@ void e2fsck_add_dir_info(e2fsck_t ctx, ext2_ino_t ino, ext2_ino_t parent) sizeof(struct dir_info), &ctx->dir_info->array); if (retval) { + fprintf(stderr, "Couldn't reallocate dir_info " + "structure to %d entries\n", + ctx->dir_info->size); + fatal_error(ctx, 0); ctx->dir_info->size -= 10; return; } diff --git a/e2fsck/dx_dirinfo.c b/e2fsck/dx_dirinfo.c index 7838a406..be53fff0 100644 --- a/e2fsck/dx_dirinfo.c +++ b/e2fsck/dx_dirinfo.c @@ -40,6 +40,10 @@ void e2fsck_add_dx_dir(e2fsck_t ctx, ext2_ino_t ino, int num_blocks) sizeof(struct dx_dir_info), &ctx->dx_dir_info); if (retval) { + fprintf(stderr, "Couldn't reallocate dx_dir_info " + "structure to %d entries\n", + ctx->dx_dir_info_size); + fatal_error(ctx, 0); ctx->dx_dir_info_size -= 10; return; } diff --git a/lib/et/compile_et.sh.in b/lib/et/compile_et.sh.in index 96772c78..a71ae8a9 100644 --- a/lib/et/compile_et.sh.in +++ b/lib/et/compile_et.sh.in @@ -5,7 +5,7 @@ datarootdir=@datarootdir@ AWK=@AWK@ DIR="${DIR-@datadir@/et}" -ET_DIR="@ET_DIR@" +ET_DIR="${ET_DIR-@ET_DIR@}" if test "$1" = "--build-tree" ; then shift; diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index f88545d4..0f8b5987 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -260,39 +260,40 @@ tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \ + $(Q) $(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG \ + $(ALL_CFLAGS) $(ALL_LDFLAGS) \ $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o tst_iscan tst_iscan.o $(ALL_LDFLAGS) $(STATIC_LIBEXT2FS) \ - $(STATIC_LIBCOM_ERR) $(SYSLIBS) + $(Q) $(CC) -o tst_iscan tst_iscan.o $(ALL_LDFLAGS) \ + $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \ - $(STATIC_LIBCOM_ERR) $(SYSLIBS) + $(Q) $(CC) -o tst_getsize tst_getsize.o $(ALL_LDFLAGS) \ + $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) \ $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" $(Q) $(CC) -o tst_ismounted $(srcdir)/ismounted.c \ - $(STATIC_LIBEXT2FS) -DDEBUG $(ALL_CFLAGS) \ + $(STATIC_LIBEXT2FS) -DDEBUG $(ALL_CFLAGS) $(ALL_LDFLAGS) \ $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \ - $(STATIC_LIBCOM_ERR) $(SYSLIBS) + $(Q) $(CC) -o tst_byteswap tst_byteswap.o $(ALL_LDFLAGS) \ + $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \ + $(Q) $(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) $(ALL_LDFLAGS) \ $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o tst_sectgetsize tst_getsectsize.o \ + $(Q) $(CC) -o tst_sectgetsize tst_getsectsize.o $(ALL_LDFLAGS) \ $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(SYSLIBS) tst_types.o: $(srcdir)/tst_types.c ext2_types.h @@ -311,7 +312,7 @@ tst_fs_struct.o: $(srcdir)/tst_fs_struct.c $(srcdir)/ext2fs.h tst_fs_struct: tst_fs_struct.o $(E) " LD $@" - $(Q) $(CC) -o tst_fs_struct tst_fs_struct.o $(SYSLIBS) + $(Q) $(CC) -o tst_fs_struct tst_fs_struct.o $(ALL_LDFLAGS) $(SYSLIBS) tst_inode_size.o: $(srcdir)/tst_inode_size.c $(srcdir)/ext2_fs.h @@ -473,28 +474,24 @@ mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount \ tst_super_size tst_types tst_inode_size tst_csum tst_crc32c tst_bitmaps \ tst_inline tst_inline_data tst_libext2fs - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_badblocks - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_iscan - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_types - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_icount - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_inode_size - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_inline - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_inline_data - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32c - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) \ - ./tst_bitmaps -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out + $(TESTENV) ./tst_bitops + $(TESTENV) ./tst_badblocks + $(TESTENV) ./tst_iscan + $(TESTENV) ./tst_types + $(TESTENV) ./tst_icount + $(TESTENV) ./tst_super_size + $(TESTENV) ./tst_inode_size + $(TESTENV) ./tst_csum + $(TESTENV) ./tst_inline + $(TESTENV) ./tst_inline_data + $(TESTENV) ./tst_crc32c + $(TESTENV) ./tst_bitmaps -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out diff $(srcdir)/tst_bitmaps_exp tst_bitmaps_out - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) \ - ./tst_bitmaps -t 2 -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out + $(TESTENV) ./tst_bitmaps -t 2 -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out diff $(srcdir)/tst_bitmaps_exp tst_bitmaps_out - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) \ - ./tst_bitmaps -t 3 -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out + $(TESTENV) ./tst_bitmaps -t 3 -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out diff $(srcdir)/tst_bitmaps_exp tst_bitmaps_out - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) \ - ./tst_bitmaps -l -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out + $(TESTENV) ./tst_bitmaps -l -f $(srcdir)/tst_bitmaps_cmds > tst_bitmaps_out diff $(srcdir)/tst_bitmaps_exp tst_bitmaps_out installdirs:: diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index 44edc0da..223a7f7e 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -160,12 +160,12 @@ uninstall:: test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(DEPLIBCOM_ERR) $(E) " LD $@" - $(Q) $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ + $(Q) $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) $(ALL_LDFLAGS) \ $(LIBSS) $(LIBCOM_ERR) $(SYSLIBS) check:: all test_ss $(E) " RUN TEST test_ss" - -@(LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0) + -@($(TESTENV) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0) $(Q) if diff test_out $(srcdir)/test_script_expected > test.diff; then \ true ; else echo "Regression test for ss library failed!"; exit 1 ; fi diff --git a/resize/Makefile.in b/resize/Makefile.in index 201e2683..ecd8619e 100644 --- a/resize/Makefile.in +++ b/resize/Makefile.in @@ -93,8 +93,7 @@ uninstall: done test_extent.out: test_extent $(srcdir)/test_extent.in - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_extent < $(srcdir)/test_extent.in \ - > test_extent.out + $(TESTENV) ./test_extent < $(srcdir)/test_extent.in > test_extent.out check:: test_extent.out $(Q) if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \ diff --git a/tests/test_config b/tests/test_config index 50e987e7..2e3af6b2 100644 --- a/tests/test_config +++ b/tests/test_config @@ -21,8 +21,8 @@ TEST_REL=../tests/progs/test_rel TEST_ICOUNT=../tests/progs/test_icount CRCSUM=../tests/progs/crcsum CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" -LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss -DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss +LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} +DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} export LD_LIBRARY_PATH export DYLD_LIBRARY_PATH TZ=GMT0 |