octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-17 17:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1069 from gaul/macos/sed

Browse Source 
Use system sed on macOS
This commit is contained in:
Takeshi Nakatani 2019-07-07 15:00:48 +09:00 committed by GitHub
commit 2349dafb98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -46,9 +46,8 @@ matrix:
before_install: before_install:
- HOMEBREW_NO_AUTO_UPDATE=1 brew tap caskroom/cask - HOMEBREW_NO_AUTO_UPDATE=1 brew tap caskroom/cask
- HOMEBREW_NO_AUTO_UPDATE=1 brew cask install osxfuse - HOMEBREW_NO_AUTO_UPDATE=1 brew cask install osxfuse
- HOMEBREW_NO_AUTO_UPDATE=1 brew install awscli cppcheck gnu-sed truncate - HOMEBREW_NO_AUTO_UPDATE=1 brew install awscli cppcheck truncate
- if [ -f /Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs ]; then sudo chmod +s /Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs ; elif [ -f /Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse ]; then sudo chmod +s /Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse ; fi - if [ -f /Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs ]; then sudo chmod +s /Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs ; elif [ -f /Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse ]; then sudo chmod +s /Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse ; fi
- sudo ln -s /usr/local/opt/gnu-sed/bin/gsed /usr/local/bin/sed
- sudo ln -s /usr/local/opt/coreutils/bin/gstdbuf /usr/local/bin/stdbuf - sudo ln -s /usr/local/opt/coreutils/bin/gstdbuf /usr/local/bin/stdbuf
script: script:
- ./autogen.sh - ./autogen.sh

2
test/integration-test-common.sh
View File

@ -186,7 +186,7 @@ function start_s3fs {
-o dbglevel=${DBGLEVEL:=info} \ -o dbglevel=${DBGLEVEL:=info} \
-o retries=3 \ -o retries=3 \
-f \ -f \
"${@}" | stdbuf -oL -eL sed -u "s/^/s3fs: /" & "${@}" | stdbuf -oL -eL sed $SED_BUFFER_FLAG "s/^/s3fs: /" &
) )
if [ `uname` = "Darwin" ]; then if [ `uname` = "Darwin" ]; then

2
test/integration-test-main.sh
View File

@ -537,7 +537,7 @@ function test_concurrency {
for i in `seq 10`; do echo foo > $i; done for i in `seq 10`; do echo foo > $i; done
for process in `seq 2`; do for process in `seq 2`; do
for i in `seq 100`; do for i in `seq 100`; do
file=$(ls | sed -n "$(($RANDOM % 10 + 1)){p;q}") file=$(ls | sed -n "$(($RANDOM % 10 + 1))p")
cat $file >/dev/null || true cat $file >/dev/null || true
rm -f $file rm -f $file
echo foo > $i || true echo foo > $i || true

6
test/test-utils.sh
View File

@ -14,6 +14,12 @@ BIG_FILE=big-file-s3fs.txt
BIG_FILE_LENGTH=$((25 * 1024 * 1024)) BIG_FILE_LENGTH=$((25 * 1024 * 1024))
export RUN_DIR export RUN_DIR
if [ `uname` = "Darwin" ]; then
export SED_BUFFER_FLAG="-l"
else
export SED_BUFFER_FLAG="--unbuffered"
fi
function mk_test_file { function mk_test_file {
if [ $# == 0 ]; then if [ $# == 0 ]; then
TEXT=$TEST_TEXT TEXT=$TEST_TEXT