Merge branches 'read-p' and 'testfix/cygwin-customaction'

tests/actions-test-lib.sh

@@ -30,3 +30,19 @@ make_action_in_folder()
     mkdir ".todo.actions.d/$1"
     [ -z "$1" ] || make_dummy_action ".todo.actions.d/$1/$1" "in folder $1"
 }
+
+invalidate_action()
+{
+    local customActionFilespec="${1:?}"; shift
+    local testName="${1:?}"; shift
+
+    chmod -x "$customActionFilespec"
+    # On Cygwin, clearing the executable flag may have no effect, as the Windows
+    # ACL may still grant execution rights. In this case, we skip the test, and
+    # remove the (still valid) custom action so that it doesn't break following
+    # tests.
+    if [ -x "$customActionFilespec" ]; then
+        SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }${testName}"
+        rm -- "$customActionFilespec"
+    fi
+}