pipesz: use native PAGE_SIZE in tests

Reported-by: Anatoly Pugachev <matorola@gmail.com>
Signed-off-by: Nathan Sharp <nwsharp@live.com>

diff --git a/tests/expected/misc/pipesz-get-fd b/tests/expected/misc/pipesz-get-fd
index ef103dc9d82e549e6055fa82c53e1b9fefe23359..aa4cab1881208f3f05b2a7f448f2f47d805f7752 100644 (file)
--- a/tests/expected/misc/pipesz-get-fd
+++ b/tests/expected/misc/pipesz-get-fd
@@ -1 +1 @@
-fd 0   65536   0
+fd 0   DEFAULT_PIPE_SIZE       0

diff --git a/tests/expected/misc/pipesz-get-file b/tests/expected/misc/pipesz-get-file
index c1e1a9d786cd0d7d2b0a77bb6ed44c26c5ec5126..32dc6bd1d3240b937cda1aef0b60bc931d96c87a 100644 (file)
--- a/tests/expected/misc/pipesz-get-file
+++ b/tests/expected/misc/pipesz-get-file
@@ -1 +1 @@
-/dev/stdin     65536   0
+/dev/stdin     DEFAULT_PIPE_SIZE       0

diff --git a/tests/ts/misc/pipesz b/tests/ts/misc/pipesz
index be5eb45e6228b772c888b8f4056f6e149a874005..25724cd4c670fa6bd56efcf668f272f4d66ad65b 100755 (executable)
--- a/tests/ts/misc/pipesz
+++ b/tests/ts/misc/pipesz
@@ -18,6 +18,10 @@ TS_DESC="pipesz"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
+set -o pipefail
+
+DEFAULT_PIPE_SIZE=$(($(getconf PAGE_SIZE) * 16))
+
 ts_check_test_command "$TS_CMD_PIPESZ"
 
 ts_init_subtest "set-fd-bad"
@@ -46,7 +50,7 @@ $TS_CMD_PIPESZ --check --get --fd 42 >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest "get-fd"
-echo -n | $TS_CMD_PIPESZ --check --get --stdin >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -n | $TS_CMD_PIPESZ --check --get --stdin 2>> $TS_ERRLOG | sed "s/$DEFAULT_PIPE_SIZE/DEFAULT_PIPE_SIZE/g" >> $TS_OUTPUT
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
@@ -56,7 +60,7 @@ $TS_CMD_PIPESZ --check --get --file "/dev/null" >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest "get-file"
-echo -n | $TS_CMD_PIPESZ --check --get --file "/dev/stdin" >> $TS_OUTPUT 2>> $TS_ERRLOG
+echo -n | $TS_CMD_PIPESZ --check --get --file "/dev/stdin" 2>> $TS_ERRLOG | sed "s/$DEFAULT_PIPE_SIZE/DEFAULT_PIPE_SIZE/g" >> $TS_OUTPUT
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
@@ -70,4 +74,6 @@ echo this_should_be_output_by_cat | $TS_CMD_PIPESZ --check --stdin cat >> $TS_OU
 [[ $? -ne 0 ]] && ts_logerr "expected success"
 ts_finalize_subtest
 
+set +o pipefail
+
 ts_finalize