Merge pull request #310 from ggtakec/master

Update integration-test-main.sh as additional change for #300
This commit is contained in:
Takeshi Nakatani 2015-12-03 22:49:55 +09:00
commit 8dbd5a3f65

View File

@ -245,7 +245,7 @@ function test_chown {
chown 1000:1000 $TEST_TEXT_FILE; chown 1000:1000 $TEST_TEXT_FILE;
# if they're the same, we have a problem. # if they're the same, we have a problem.
if [ $(stat --format=%a $TEST_TEXT_FILE) == $ORIGINAL_PERMISSIONS ] if [ $(stat --format=%u:%g $TEST_TEXT_FILE) == $ORIGINAL_PERMISSIONS ]
then then
echo "Could not modify $TEST_TEXT_FILE ownership" echo "Could not modify $TEST_TEXT_FILE ownership"
exit 1 exit 1
@ -382,7 +382,7 @@ function test_mtime_file {
echo "Testing mtime preservation function ..." echo "Testing mtime preservation function ..."
# if the rename file exists, delete it # if the rename file exists, delete it
if [ -e $ALT_TEST_TEXT_FILE ] if [ -e $ALT_TEST_TEXT_FILE -o -L $ALT_TEST_TEXT_FILE ]
then then
rm $ALT_TEST_TEXT_FILE rm $ALT_TEST_TEXT_FILE
fi fi