Also get rid of TMP_FILE in todo.cfg.

There's a slight chance that some add-on has used this (undocumented, unofficial) configuration value for its own purposes (and maybe also relied on the unexposed cleanup() infrastructure), but detecting and fixing that problem (by moving the cleanup into the add-on itself) is pretty straightforward.

tests/aggregate-results.sh

@@ -1,57 +1,4 @@
-#!/bin/bash
-
-[ "x$TERM" != "xdumb" ] && (
-		export TERM &&
-		[ -t 1 ] &&
-		tput bold >/dev/null 2>&1 &&
-		tput setaf 1 >/dev/null 2>&1 &&
-		tput sgr0 >/dev/null 2>&1
-	) &&
-	color=t
-
-case "$1" in
---no-color)
-	color=; shift ;;
-esac
-
-if test -n "$color"; then
-	say_color () {
-		(
-		export TERM
-		case "$1" in
-			error) tput bold; tput setaf 1;; # bold red
-			skip)  tput bold; tput setaf 2;; # bold green
-			pass)  tput setaf 2;;            # green
-			info)  tput setaf 3;;            # brown
-			*) test -n "$quiet" && return;;
-		esac
-		shift
-		printf "* %s" "$*"
-		tput sgr0
-		echo
-		)
-	}
-else
-	say_color() {
-		test -z "$1" && test -n "$quiet" && return
-		shift
-		echo "* $*"
-	}
-fi
-
-get_color()
-{
-	# Only use the supplied color if there are actually instances of that
-	# type, so that a clean test run does not distract the user by the
-	# appearance of the error highlighting.
-	if [ ${1:?} -eq 0 ]
-	then
-		echo 'info'
-	else
-		echo "${2:-info}"
-	fi
-}
-
+#!/bin/sh
 
 fixed=0
 success=0
@@ -80,8 +27,8 @@ do
 	done <"$file"
 done
 
-say_color 'info'                           "$(printf "%-8s%d\n" fixed $fixed)"
-say_color "$(get_color "$success" 'pass')" "$(printf "%-8s%d\n" success $success)"
-say_color "$(get_color "$failed" 'error')" "$(printf "%-8s%d\n" failed $failed)"
-say_color "$(get_color "$broken" 'error')" "$(printf "%-8s%d\n" broken $broken)"
-say_color 'info'                           "$(printf "%-8s%d\n" total $total)"
+printf "%-8s%d\n" fixed $fixed
+printf "%-8s%d\n" success $success
+printf "%-8s%d\n" failed $failed
+printf "%-8s%d\n" broken $broken
+printf "%-8s%d\n" total $total

tests/t1250-listpri.sh

@@ -61,42 +61,6 @@ TODO: 0 of 5 tasks shown
 TODO: 0 of 5 tasks shown
 EOF
 
-cat > todo.txt <<EOF
-(B) smell the uppercase Roses +flowers @outside
-(X) clean the house from A-Z
-(C) notice the sunflowers
-(X) listen to music
-buy more records from artists A-Z
-EOF
-test_todo_session 'listpri filtering priority ranges' <<EOF
->>> todo.sh -p listpri a-c
-1 (B) smell the uppercase Roses +flowers @outside
-3 (C) notice the sunflowers
---
-TODO: 2 of 5 tasks shown
-
->>> todo.sh -p listpri c-Z
-3 (C) notice the sunflowers
-2 (X) clean the house from A-Z
-4 (X) listen to music
---
-TODO: 3 of 5 tasks shown
-
->>> todo.sh -p listpri A-
-2 (X) clean the house from A-Z
---
-TODO: 1 of 5 tasks shown
-
->>> todo.sh -p listpri A-C A-Z
---
-TODO: 0 of 5 tasks shown
-
->>> todo.sh -p listpri X A-Z
-2 (X) clean the house from A-Z
---
-TODO: 1 of 5 tasks shown
-EOF
-
 cat > todo.txt <<EOF
 (B) ccc xxx this line should be third.
 ccc xxx this line should be third.

tests/test-lib.sh

@@ -180,7 +180,7 @@ test_failure_ () {
 	test_failure=$(($test_failure + 1))
 	say_color error "FAIL $test_count: $1"
 	shift
-	echo "$@"
+	echo "$@" | sed -e 's/^/	/'
 	test "$immediate" = "" || { trap - EXIT; exit 1; }
 }
 
@@ -199,9 +199,8 @@ test_debug () {
 }
 
 test_run_ () {
-	eval > output 2>&1 "$1"
+	eval >&3 2>&4 "$1"
 	eval_ret="$?"
-	cat >&3 output
 	return 0
 }
 
@@ -261,57 +260,6 @@ test_expect_success () {
 	echo >&3 ""
 }
 
-test_expect_output () {
-	test "$#" = 2 ||
-	error "bug in the test script: not 2 parameters to test-expect-output"
-	if ! test_skip "$@"
-	then
-		say >&3 "expecting success and output: $2"
-		test_run_ "$2"
-		if [ "$?" = 0 -a "$eval_ret" = 0 ]
-		then
-			cmp_output=$(test_cmp expect output)
-			if [ "$?" = 0 ]
-			then
-				test_ok_ "$1"
-			else
-				test_failure_ "$@" "
-$cmp_output"
-			fi
-		else
-			test_failure_ "$@"
-		fi
-	fi
-	echo >&3 ""
-}
-
-test_expect_code_and_output () {
-	test "$#" = 3 ||
-	error "bug in the test script: not 3 parameters to test-expect-code-and-output"
-	if ! test_skip "$@"
-	then
-		say >&3 "expecting exit code $1 and output: $3"
-		test_run_ "$3"
-		if [ "$?" = 0 -a "$eval_ret" = "$1" ]
-		then
-			cmp_output=$(test_cmp expect output)
-			if [ "$?" = 0 ]
-			then
-				test_ok_ "$2"
-			else
-				test_failure_ "$2" "$3" "
-$cmp_output"
-			fi
-		else
-			cmp_output=$(test_cmp expect output)
-			test_failure_ "$2" "$3" "
-* expected exit code $1, actual ${eval_ret}${cmp_output:+
-}${cmp_output}"
-		fi
-	fi
-	echo >&3 ""
-}
-
 test_expect_code () {
 	test "$#" = 3 ||
 	error "bug in the test script: not 3 parameters to test-expect-code"
@@ -323,8 +271,7 @@ test_expect_code () {
 		then
 			test_ok_ "$2"
 		else
-			test_failure_ "$2" "$3" "
-* expected exit code $1, actual ${eval_ret}"
+			test_failure_ "$@"
 		fi
 	fi
 	echo >&3 ""
@@ -595,9 +542,9 @@ test_todo_session () {
 	"")
 	    if [ ! -z "$cmd" ]; then
 		if [ $status = 0 ]; then
-		    test_expect_output "$1 $subnum" "$cmd"
+		    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
 		else
-		    test_expect_code_and_output "$status" "$1 $subnum" "$cmd"
+		    test_expect_success "$1 $subnum" "$cmd > output ; test \$? = $status && test_cmp expect output"
 		fi
 
 		subnum=$(($subnum + 1))
@@ -613,9 +560,9 @@ test_todo_session () {
     done
     if [ ! -z "$cmd" ]; then
 	if [ $status = 0 ]; then
-	    test_expect_output "$1 $subnum" "$cmd"
+	    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
 	else
-	    test_expect_code_and_output "$status" "$1 $subnum" "$cmd"
+	    test_expect_success "$1 $subnum" "$cmd > output ; test \$? = $status && test_cmp expect output"
 	fi
     fi
 }

todo.sh

@@ -59,7 +59,7 @@ shorthelp()
 		    listall|lsa [TERM...]
 		    listcon|lsc
 		    listfile|lf [SRC [TERM...]]
-		    listpri|lsp [PRIORITIES] [TERM...]
+		    listpri|lsp [PRIORITY] [TERM...]
 		    listproj|lsprj [TERM...]
 		    move|mv ITEM# DEST [SRC]
 		    prepend|prep ITEM# "TEXT TO PREPEND"
@@ -231,11 +231,10 @@ help()
 		      Without any arguments, the names of all text files in the todo.txt
 		      directory are listed.
 		
-		    listpri [PRIORITIES] [TERM...]
-		    lsp [PRIORITIES] [TERM...]
-		      Displays all tasks prioritized PRIORITIES.
-		      PRIORITIES can be a single one (A) or a range (A-C).
-		      If no PRIORITIES specified, lists all prioritized tasks.
+		    listpri [PRIORITY] [TERM...]
+		    lsp [PRIORITY] [TERM...]
+		      Displays all tasks prioritized PRIORITY.
+		      If no PRIORITY specified, lists all prioritized tasks.
 		      If TERM specified, lists only prioritized tasks that contain TERM(s).
 		      Hides all tasks that contain TERM(s) preceded by a minus sign
 		      (i.e. -TERM).  
@@ -1139,8 +1138,8 @@ case $action in
 "listpri" | "lsp" )
     shift ## was "listpri", new $1 is priority to list or first TERM
 
-    pri=$(printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep -e '^[A-Z]$' -e '^[A-Z]-[A-Z]$') && shift || pri="A-Z"
-    post_filter_command="grep '^ *[0-9]\+ ([${pri}]) '"
+    pri=$(printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$') && shift || pri="[A-Z]"
+    post_filter_command="grep '^ *[0-9]\+ (${pri}) '"
     _list "$TODO_FILE" "$@"
     ;;