flo/todo.txt-cli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test listaddons: Make pass on Cygwin

Browse Source 
If a custom action cannot be made non-executable, it needs to be removed as well (and the test skipped); otherwise its existence will break following tests that assume it's inactive.
This commit is contained in:
Pegasust
2022-06-16 16:28:05 -07:00
committed by Ingo Karkat
parent ea32af34e6
commit 1a5600c79c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/t8010-listaddons.sh
View File

@@ -30,9 +30,11 @@ EOF
chmod -x .todo.actions.d/foo chmod -x .todo.actions.d/foo
# On Cygwin, clearing the executable flag may have no effect, as the Windows ACL # 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. # 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 .todo.actions.d/foo ]; then if [ -x .todo.actions.d/foo ]; then
SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }t8010.4" SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }t8010.4"
rm .todo.actions.d/foo
fi fi
test_todo_session 'nonexecutable action' <<EOF test_todo_session 'nonexecutable action' <<EOF
>>> todo.sh listaddons >>> todo.sh listaddons
@@ -69,9 +71,11 @@ EOF
# nthorne: shamelessly stolen from above.. # nthorne: shamelessly stolen from above..
chmod -x .todo.actions.d/norris/norris chmod -x .todo.actions.d/norris/norris
# On Cygwin, clearing the executable flag may have no effect, as the Windows ACL # 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. # 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 .todo.actions.d/norris/norris ]; then if [ -x .todo.actions.d/norris/norris ]; then
SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }t8010.8" SKIP_TESTS="${SKIP_TESTS}${SKIP_TESTS+ }t8010.8"
rm .todo.actions.d/norris/norris
fi fi
test_todo_session 'nonexecutable action in subfolder' <<EOF test_todo_session 'nonexecutable action in subfolder' <<EOF
>>> todo.sh listaddons >>> todo.sh listaddons