A couple of small changes to the check collateral:

- The script was looking for /root/.passwd-s3fs on my debian
machine (it worked correctly on Ubuntu). Fixed the common.sh
file to always look in the SUDO_USER's home directory

- Added the passwd_file option to the s3fs command. Since the
test runs as root, the $SUDO_USER's password file wasn't
being looked for by the program itself. Instead the normal
precedence was being followed and the /etc/passwd-s3fs file
was being used.



git-svn-id: http://s3fs.googlecode.com/svn/trunk@234 df820570-a93a-0410-bd06-b72b767a4274

s3fs/test/integration-test-common.sh

@@ -2,7 +2,7 @@
 
 S3FS=../src/s3fs
 
-S3FS_CREDENTIALS_FILE=~/.passwd-s3fs
+S3FS_CREDENTIALS_FILE=$(eval echo ~${SUDO_USER}/.passwd-s3fs)
 
 TEST_BUCKET_1=${SUDO_USER}-s3fs-integration-test
 TEST_BUCKET_MOUNT_POINT_1=/mnt/${TEST_BUCKET_1}

s3fs/test/small-integration-test.sh

@@ -16,7 +16,7 @@ if [ ! -d $TEST_BUCKET_MOUNT_POINT_1 ]
 then
 	mkdir -p $TEST_BUCKET_MOUNT_POINT_1
 fi
-$S3FS $TEST_BUCKET_1 $TEST_BUCKET_MOUNT_POINT_1
+$S3FS $TEST_BUCKET_1 $TEST_BUCKET_MOUNT_POINT_1 -o passwd_file=$S3FS_CREDENTIALS_FILE
 CUR_DIR=`pwd`
 cd $TEST_BUCKET_MOUNT_POINT_1