Branch b1_6

b=12646
i=adilger

Description: sanity.sh test_77h fails with "test_77h file compare failed"
Details    : test_77h uses a file which was messed by other test case.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index e9979a2..82f4e7a 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -386,6 +386,11 @@ Details    : if request processig with error which can be recoverable on server
             request should be resend, otherwise page released from cache and marked 
             as error.
 
+Severity   : normal
+Bugzilla   : 12646
+Description: sanity.sh test_77h fails with "test_77h file compare failed"
+Details    : test_77h uses a file which was messed by other test case.
+
 --------------------------------------------------------------------------------
 
 2007-05-03  Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 98b5360..bebcadd 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3096,7 +3096,7 @@ test_77g() { # bug 10889
        #define OBD_FAIL_OST_CHECKSUM_RECEIVE       0x21a
        sysctl -w lustre.fail_loc=0x8000021a
        set_checksums 1
-       dd if=$F77_TMP of=$DIR/f77 bs=1M count=$F77SZ || \
+       dd if=$F77_TMP of=$DIR/f77g bs=1M count=$F77SZ || \
                error "write error: rc=$?"
        sysctl -w lustre.fail_loc=0
        set_checksums 0
@@ -3111,7 +3111,7 @@ test_77h() { # bug 10889
        #define OBD_FAIL_OST_CHECKSUM_SEND          0x21b
        sysctl -w lustre.fail_loc=0x8000021b
        set_checksums 1
-       cmp $F77_TMP $DIR/f77 || error "file compare failed"
+       cmp $F77_TMP $DIR/f77g || error "file compare failed"
        sysctl -w lustre.fail_loc=0
        set_checksums 0
 }