diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | tests/README.rst | 2 | ||||
| -rw-r--r-- | tests/search/FreeBSD.bl | 2 | ||||
| -rwxr-xr-x | tests/test.sh | 10 | ||||
| -rw-r--r-- | tests/utf8/FreeBSD.bl | 1 |
6 files changed, 16 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b8655a5..6f35388 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,7 @@ dist-hook: find * -name 'data*' -o \ -name '*.in' -o \ -name '*.tst' -o \ + -name '*.bl' -o \ -name '*.good' \ | cpio -o > tests.cpio 2>/dev/null @gzip -f9 $(distdir)/tests/tests.cpio diff --git a/Makefile.in b/Makefile.in index 440be58..682b74a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -833,6 +833,7 @@ dist-hook: find * -name 'data*' -o \ -name '*.in' -o \ -name '*.tst' -o \ + -name '*.bl' -o \ -name '*.good' \ | cpio -o > tests.cpio 2>/dev/null @gzip -f9 $(distdir)/tests/tests.cpio diff --git a/tests/README.rst b/tests/README.rst index ea52fad..3a74e53 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -28,6 +28,8 @@ The files present in this directory are: - ``t????.in`` contains the words to feed smenu. - ``t????.good`` is the screen content of the test after a successful run. - ``t????.tst`` contains the keystrokes to pass to smenu. +- ``*.bl`` contains the blacklisted tests to ignore for an given OS + (one per line). - ``test.sh`` runs a single test. - ``tests.sh`` runs selected or all tests. diff --git a/tests/search/FreeBSD.bl b/tests/search/FreeBSD.bl new file mode 100644 index 0000000..fae5c05 --- /dev/null +++ b/tests/search/FreeBSD.bl @@ -0,0 +1,2 @@ +t0023 +t0024 diff --git a/tests/test.sh b/tests/test.sh index e23de92..e48d6ee 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -9,7 +9,7 @@ upsearch () { while [ $n -gt 0 ]; do test -e "$directory/$1" && echo "$directory" && return directory="$directory/.." - n = $(expr n - 1) + n=$(expr $n - 1) done } @@ -28,6 +28,7 @@ fi LOG=${PWD}.log PTYLIE=${PTYLIE_PATH:+${PTYLIE_PATH}/}ptylie HVLT=${HLVT_PATH:+${HLVT_PATH}/}hlvt +BL=$(uname -s).bl # Check for the presence of required programs # """"""""""""""""""""""""""""""""""""""""""" @@ -43,6 +44,13 @@ for PROG in $PTYLIE $HLVT; do fi done +# Ignore blacklisted tests for this OS. +# These tests probably need a fixed version of ptylie to work +# """"""""""""""""""""""""""""""""""""""""""""""""""""""""""" +if [ -f "$BL" ]; then + grep $1 $BL >/dev/null 2>&1 && exit 0 +fi + # Launch the test # """"""""""""""" clear diff --git a/tests/utf8/FreeBSD.bl b/tests/utf8/FreeBSD.bl new file mode 100644 index 0000000..8da4c30 --- /dev/null +++ b/tests/utf8/FreeBSD.bl @@ -0,0 +1 @@ +t0002 |