Merge topic branch t/sf_float into pu

[paraslash.git] / t / t0005-man.sh

diff --git a/t/t0005-man.sh b/t/t0005-man.sh
index de3a81df375953b6a5e158d7aeb012178419c8c6..307be1240a559dd5b8a1773a0b1dc1c2447e1a4f 100755 (executable)
--- a/t/t0005-man.sh
+++ b/t/t0005-man.sh
@@ -13,8 +13,6 @@ filter/receiver/writer options as appropriate '
 
 . ${0%/*}/test-lib.sh
 
-rfw_regex='Options for .\{100,\}Options for ' # recv/filter/writer
-
 grep_man()
 {
        local regex="$1" exe="$2"
@@ -24,10 +22,9 @@ grep_man()
 # check that options of all reveivers/filters/writers are contained
 # in the man pages
 
-regex="$rfw_regex"
 test_expect_success 'para_recv: receiver options' "grep_man 'RECEIVERS' recv"
 test_expect_success 'para_filter: filter options' "grep_man 'FILTERS' filter"
-test_expect_success 'para_write: writer options' "grep_man '$regex' write"
+test_expect_success 'para_write: writer options' "grep_man 'WRITERS' write"
 test_require_objects "audiod"
 if [[ -n "$result" ]]; then
        test_skip 'para_audiod' "missing object(s): $result"
@@ -37,7 +34,7 @@ else
        test_expect_success 'para_audiod: filters' \
                "grep_man 'FILTERS' audiod"
        test_expect_success 'para_audiod: writers' \
-               "grep_man 'Options for the file writer' audiod"
+               "grep_man 'WRITERS' audiod"
 fi
 
 # check various command lists
@@ -61,7 +58,12 @@ else
                "grep_man '$regex' server"
 fi
 
-# para_play is always built
-regex='LIST OF COMMANDS.\{100,\}'
-test_expect_success 'para_play: play commands' "grep_man '$regex' play"
+test_require_objects 'play'
+missing_objects="$result"
+if [[ -n "$missing_objects" ]]; then
+       test_skip 'para_play' "missing object(s): $missing_objects"
+else
+       regex='LIST OF COMMANDS.\{100,\}'
+       test_expect_success 'para_play: play commands' "grep_man '$regex' play"
+fi
 test_done