diff --git a/config/parse-types.sh b/config/parse-types.sh index 8da34fd..0887054 100755 --- a/config/parse-types.sh +++ b/config/parse-types.sh @@ -8,8 +8,16 @@ s/typedef \(.*\) __u\([1-9]*\);/#define __U\2_TYPEDEF \1/ s/typedef \(.*\) __s\([1-9]*\);/#define __S\2_TYPEDEF \1/ EOF -echo '#include ' | ${CPP-${CC-gcc} -E} - | \ - sed -f sed.script | grep ^# > asm_types.h +if test -z "$CC"; then + CC=gcc +fi + +if test -z "$CPP"; then + CPP="$CC -E" +fi + +echo '#include ' | $CPP - | \ + sed -f sed.script | grep '^#' > asm_types.h rm sed.script @@ -99,8 +107,10 @@ main(int argc, char **argv) EOF ${BUILD_CC-${CC-gcc}} -o asm_types asm_types.c -if ! ./asm_types +if ./asm_types then + /bin/true +else echo "Problem detected with asm_types.h" echo "" > asm_types.h fi diff --git a/e2fsck/crc32defs.h b/e2fsck/crc32defs.h index 7d770d3..27414d2 100644 --- a/e2fsck/crc32defs.h +++ b/e2fsck/crc32defs.h @@ -55,7 +55,7 @@ #define __le32_to_cpu(x) (x) #endif -#ifdef __GNUC__ +#if (__GNUC__ >= 3) #define likely(x) __builtin_expect(!!(x), 1) #define unlikely(x) __builtin_expect(!!(x), 0) #else diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index 22be945..f9e32b2 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -50,7 +50,7 @@ extern e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */ typedef struct { int object_length; -} kmem_cache_t; +} lkmem_cache_t; #define kmem_cache_alloc(cache,flags) malloc((cache)->object_length) #define kmem_cache_free(cache,obj) free(obj) @@ -74,8 +74,8 @@ typedef unsigned int __be32; * We use the standard libext2fs portability tricks for inline * functions. */ -extern kmem_cache_t * do_cache_create(int len); -extern void do_cache_destroy(kmem_cache_t *cache); +extern lkmem_cache_t * do_cache_create(int len); +extern void do_cache_destroy(lkmem_cache_t *cache); extern size_t journal_tag_bytes(journal_t *journal); #if (defined(E2FSCK_INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS)) @@ -89,16 +89,16 @@ extern size_t journal_tag_bytes(journal_t *journal); #endif #endif -_INLINE_ kmem_cache_t * do_cache_create(int len) +_INLINE_ lkmem_cache_t * do_cache_create(int len) { - kmem_cache_t *new_cache; + lkmem_cache_t *new_cache; new_cache = malloc(sizeof(*new_cache)); if (new_cache) new_cache->object_length = len; return new_cache; } -_INLINE_ void do_cache_destroy(kmem_cache_t *cache) +_INLINE_ void do_cache_destroy(lkmem_cache_t *cache) { free(cache); } diff --git a/e2fsck/revoke.c b/e2fsck/revoke.c index bb4888d..1665099 100644 --- a/e2fsck/revoke.c +++ b/e2fsck/revoke.c @@ -71,8 +71,8 @@ #include #endif -static kmem_cache_t *revoke_record_cache; -static kmem_cache_t *revoke_table_cache; +static lkmem_cache_t *revoke_record_cache; +static lkmem_cache_t *revoke_table_cache; /* Each revoke record represents one single revoked block. During journal replay, this involves recording the transaction ID of the diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index 9d7b566..3581bd9 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -170,9 +170,9 @@ test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(LIBCOM_ERR) check:: all test_ss @echo " RUN TEST test_ss" - @(LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0) - @if ! diff test_out $(srcdir)/test_script_expected > test.diff; then \ - echo "Regression test for ss library failed!"; exit 1 ; fi + -@(LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0) + @if diff test_out $(srcdir)/test_script_expected > test.diff; then \ + /bin/true ; else echo "Regression test for ss library failed!"; exit 1 ; fi clean:: $(RM) -f ../libss.a libss.a mk_cmds ss_err.h ss_err.c std_rqs.c \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 2c3ac76..3659087 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -24,7 +24,7 @@ test_script: test_script.in Makefile mke2fs.conf @chmod +x test_script mke2fs.conf: $(srcdir)/../misc/mke2fs.conf - sed -e 's/blocksize = -1/blocksize = 4096/' $< >mke2fs.conf + sed -e 's/blocksize = -1/blocksize = 4096/' $(srcdir)/../misc/mke2fs.conf >mke2fs.conf check:: test_script @echo "Running e2fsprogs test suite..." diff --git a/tests/u_mke2fs/script b/tests/u_mke2fs/script index 671eace..8d51159 100644 --- a/tests/u_mke2fs/script +++ b/tests/u_mke2fs/script @@ -1,7 +1,8 @@ printf "e2undo with mke2fs: " if test -x $E2UNDO_EXE; then -export E2FSPROGS_UNDO_DIR=./ +E2FSPROGS_UNDO_DIR=./ +export E2FSPROGS_UNDO_DIR TDB_FILE=./mke2fs-test.img.e2undo OUT=$test_name.log rm -f $TDB_FILE >/dev/null 2>&1 @@ -10,16 +11,16 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 echo mke2fs -q -F -o Linux -b 1024 test.img > $OUT $MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1 -md5=$(md5sum $TMPFILE | cut -d " " -f 1) +md5=`md5sum $TMPFILE | cut -d " " -f 1` echo md5sum before mke2fs $md5 >> $OUT echo using mke2fs to test e2undo >> $OUT $MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE >> $OUT 2>&1 -new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) +new_md5=`md5sum $TMPFILE | cut -d " " -f 1` echo md5sum after mke2fs $new_md5 >> $OUT $E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1 -new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) +new_md5=`md5sum $TMPFILE | cut -d " " -f 1` echo md5sum after e2undo $new_md5 >> $OUT if [ $md5 = $new_md5 ]; then diff --git a/tests/u_tune2fs/script b/tests/u_tune2fs/script index e1ca7d1..5382cad 100644 --- a/tests/u_tune2fs/script +++ b/tests/u_tune2fs/script @@ -1,7 +1,8 @@ printf "e2undo with tune2fs: " if test -x $E2UNDO_EXE; then -export E2FSPROGS_UNDO_DIR=./ +E2FSPROGS_UNDO_DIR=./ +export E2FSPROGS_UNDO_DIR TDB_FILE=./tune2fs-test.img.e2undo OUT=$test_name.log rm -f $TDB_FILE >/dev/null 2>&1 @@ -10,16 +11,16 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 echo mke2fs -q -F -o Linux -b 1024 $TMPFILE > $OUT $MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1 -md5=$(md5sum $TMPFILE | cut -d " " -f 1) +md5=`md5sum $TMPFILE | cut -d " " -f 1` echo md5sum before tune2fs $md5 >> $OUT echo using tune2fs to test e2undo >> $OUT $TUNE2FS -I 256 $TMPFILE >> $OUT 2>&1 -new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) +new_md5=`md5sum $TMPFILE | cut -d " " -f 1` echo md5sum after tune2fs $new_md5 >> $OUT $E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1 -new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) +new_md5=`md5sum $TMPFILE | cut -d " " -f 1` echo md5sum after e2undo $new_md5 >> $OUT if [ $md5 = $new_md5 ]; then