diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-17 01:13:08 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-17 01:13:08 -0200 |
| commit | 53f6224e2d2c2657f316b44851889c9dd9a5266e (patch) | |
| tree | d12efa2c3d0300888f186d75afac9bcdef0b9c12 /~lukeshu/9mount/fix-checks.patch | |
| parent | 56540f6473669a5f7e1210a771df5a61ed6a9dcb (diff) | |
| parent | 4a0d84ee70b7ed0343eeb0c09df08c991ff7d95c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to '~lukeshu/9mount/fix-checks.patch')
| -rw-r--r-- | ~lukeshu/9mount/fix-checks.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/~lukeshu/9mount/fix-checks.patch b/~lukeshu/9mount/fix-checks.patch new file mode 100644 index 000000000..9af711ba5 --- /dev/null +++ b/~lukeshu/9mount/fix-checks.patch @@ -0,0 +1,24 @@ +--- test.sh.orig 2012-10-15 11:15:07.000000000 -0400 ++++ test.sh 2012-10-15 11:15:11.000000000 -0400 +@@ -7,7 +7,7 @@ + shift; shift + actual=$(9mount -n "$@" 2>&1) + aopts=$(echo $actual |sed 's/.*-o \([^ ]*\) .*/\1/' |tr , '\n' |sort |tr '\n' , |sed 's/,$//') +- actual=$(echo $actual |sed 's/-o [^ ]*/-o '"$aopts"'/') ++ actual=$(echo $actual |sed -e 's/-o [^ ]*/-o '"$aopts"'/' -e 's/ ::1 / 127.0.0.1 /') + if [ "$expected" != "$actual" ]; then + echo ' '9mount "$@" + echo $expected' #expected' +@@ -48,6 +48,7 @@ + output=$(9mount -n "$@" 2>&1) && { + echo ' '9mount "$@" + echo $output' #should have failed!' ++ exit 1 + } + } + +@@ -59,3 +60,4 @@ + shouldfail unix!/tmp/9mount!qux $mtpt + shouldfail virtio!/dev/chan!bar $mtpt + shouldfail tcp!localhost!564!foo $mtpt ++exit 0 |