From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 11 Sep 2014 16:40:43 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~209
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=330cebc0e95aa8d81477a63932381bcc84eea3c1;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	debugfs/debugfs.c
	e2fsck/Makefile.in
	lib/ext2fs/Makefile.in
	tests/test_config
---

330cebc0e95aa8d81477a63932381bcc84eea3c1
diff --cc e2fsck/Makefile.in
index c40b188,b1ce222..cf044b1
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@@ -126,9 -127,18 +126,9 @@@ e2fsck.profiled: $(OBJS)  $(PROFILED_DE
  	$(Q) $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
  		$(PROFILED_LIBS) 
  
 -gen_crc32table: $(srcdir)/gen_crc32table.c
 -	$(E) "	CC $@"
 -	$(Q) $(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gen_crc32table \
 -		$(srcdir)/gen_crc32table.c
 -
 -crc32table.h: gen_crc32table
 -	$(E) "	GEN32TABLE $@"
 -	$(Q) ./gen_crc32table > crc32table.h
 -
  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) \
@@@ -151,12 -165,14 +151,13 @@@ tst_logfile: $(srcdir)/logfile.
  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_crc32 tst_problem
 +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_crc32
+ 	$(TESTENV) ./tst_problem
  
  extend: extend.o
  	$(E) "	LD $@"
diff --cc lib/ext2fs/Makefile.in
index f88545d,847c26b..0f8b598
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@@ -472,29 -453,24 +473,25 @@@ mkjournal: mkjournal.c $(STATIC_LIBEXT2
  
  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_libext2fs
 +    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 --cc tests/test_config
index 50e987e,dbc36fe..2e3af6b
--- a/tests/test_config
+++ b/tests/test_config
@@@ -20,9 -20,8 +20,9 @@@ E2UNDO_EXE="../misc/e2undo
  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