aboutsummaryrefslogtreecommitdiff
path: root/tests/test/script/runner/cleanup.test
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2016-12-31 03:14:50 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-01-05 15:30:49 +0300
commitb917233d4b618d587f569706d8d528b051efdba4 (patch)
tree1ff132a7299cb962a5be4be3a4b0fadeea2141f3 /tests/test/script/runner/cleanup.test
parente1837dc7da78055ab3e355c3e941a7415146c1b8 (diff)
Tests cleanup
Diffstat (limited to 'tests/test/script/runner/cleanup.test')
-rw-r--r--tests/test/script/runner/cleanup.test414
1 files changed, 212 insertions, 202 deletions
diff --git a/tests/test/script/runner/cleanup.test b/tests/test/script/runner/cleanup.test
index 6f6bb95..aec3f20 100644
--- a/tests/test/script/runner/cleanup.test
+++ b/tests/test/script/runner/cleanup.test
@@ -6,76 +6,221 @@
b += --no-column
-# Valid cleanups.
-#
# @@ TODO: $c <'$* -f a &a' && $b
#
-: file-always
-:
-$c <'$* -f a &a';
-$b
-
-: file-maybe
-:
-$c <'$* &?a';
-$b
-
-: file-never
-:
-$c <'$* &!a';
-$b
-
-: file-implicit
-:
-: Test that a file created out of the testscript working directory is not
-: implicitly registered for cleanup. If it were, the test would fail due to
-: rm failure.
-:
-$c <'touch ../../a';
-$b;
-rm a
-
-: file-append
-:
-: Test that file append redirect does not not register cleanup. If it did,
-: that cleanup would fail as the file would be already deleted by rm.
-:
-$c <<EOI;
-touch a &!a;
-$* -o foo >>>&a;
-rm a
-EOI
-$b
-
-: dir-always
-:
-$c <'$* -d a &a/';
-$b
-
-: dir-maybe
-:
-$c <'$* &?a/';
-$b
-
-: dir-implicit
-:
-: Test that a directory created out of the testscript working directory is not
-: implicitly registered for cleanup. If it were, the test would fail due to
-: rm failure.
-:
-$c <'mkdir ../../a';
-$b;
-rm -r a
-: wildcard-always
-:
-$c <'$* -d a/b -f a/b/c &a/***';
-$b
-
-: wildcard-maybe
-:
-$c <'$* &?a/***';
-$b
+: file
+:
+{
+ : always
+ :
+ $c <'$* -f a &a';
+ $b
+
+ : maybe
+ :
+ $c <'$* &?a';
+ $b
+
+ : never
+ :
+ $c <'$* &!a';
+ $b
+
+ : implicit
+ :
+ : Test that a file created out of the testscript working directory is not
+ : implicitly registered for cleanup. If it were, the test would fail due to
+ : the file absence at the cleanup time.
+ :
+ $c <<EOI;
+ touch ../../a;
+ rm -f ../../a
+ EOI
+ $b
+
+ : append
+ :
+ : Test that file append redirect does not not register cleanup. If it did,
+ : that cleanup would fail as the file would be already deleted by rm.
+ :
+ $c <<EOI;
+ touch a &!a;
+ $* -o foo >>>&a;
+ rm a
+ EOI
+ $b
+
+ : not-exists
+ :
+ : Test cleanup of non-existing file.
+ :
+ $c <'$* &a';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup file test[/\\]1[/\\]a does not exist%
+ EOE
+
+ : out-wd
+ :
+ : Test explicit cleanup of a file out of the testscript working directory.
+ :
+ $c <'$* &../../a';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: file cleanup \.\.[/\\]\.\.[/\\]a is out of working directory test[/\\]%
+ EOE
+
+ : in-wd
+ :
+ : Test cleanup explicit registration of a file being outside the test working
+ : directory but inside the script working directory.
+ :
+ $c <'$* &../a';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup file test[/\\]a does not exist%
+ EOE
+
+ : not-file
+ :
+ : Test cleanup of a directory as a file. Note that there is an optional
+ : trailing blank line in the regex that matches the newline added by msvcrt
+ : as a part of the error description.
+ :
+ $c <'$* -d a &a';
+ $b 2>>~%EOE% != 0
+ %error: unable to remove file test[/\\]1[/\\]a: .+%
+ %%?
+ EOE
+}
+
+: dir
+:
+{
+ : always
+ :
+ $c <'$* -d a &a/';
+ $b
+
+ : maybe
+ :
+ $c <'$* &?a/';
+ $b
+
+ : implicit
+ :
+ : Test that a directory created out of the testscript working directory is
+ : not implicitly registered for cleanup. If it were, the test would fail due
+ : to the directory absence at the cleanup time.
+ :
+ $c <<EOI;
+ mkdir ../../a;
+ rm -r -f ../../a
+ EOI
+ $b
+
+ : not-exists
+ :
+ : Test cleanup of non-existing directory.
+ :
+ $c <'$* &a/';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup directory test[/\\]1[/\\]a[/\\] does not exist%
+ EOE
+
+ : out-wd
+ :
+ : Test cleanup of a directory out of the testscript working directory.
+ :
+ $c <'$* &../../a/';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: directory cleanup \.\.[/\\]\.\.[/\\]a[/\\] is out of working directory test[/\\]%
+ EOE
+
+ : in-wd
+ :
+ : Test cleanup explicit registration of a directory being outside the test
+ : working directory but inside the testscript working directory.
+ :
+ $c <'$* &../a/';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup directory test[/\\]a[/\\] does not exist%
+ EOE
+
+ : not-empty
+ :
+ : Test cleanup of a non-empty directory.
+ :
+ $c <'$* -d a -f a/b &a/';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup directory test[/\\]1[/\\]a[/\\] is not empty%
+ EOE
+
+ : not-dir
+ :
+ : Test cleanup of a file as a directory. Note that there is an optional
+ : trailing blank line in the regex that matches the newline added by msvcrt
+ : as a part of the error description.
+ :
+ $c <'$* -f a &a/';
+ $b 2>>~%EOE% != 0
+ %error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
+ %%?
+ EOE
+}
+
+: wildcard
+:
+{
+ : always
+ :
+ $c <'$* -d a/b -f a/b/c &a/***';
+ $b
+
+ : maybe
+ :
+ $c <'$* &?a/***';
+ $b
+
+ : not-exists
+ :
+ : Test cleanup of a wildcard not matching any directory.
+ :
+ $c <'$* &a/***';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup wildcard test[/\\]1[/\\]a[/\\]\*\*\* doesn't match a directory%
+ EOE
+
+ : out-wd
+ :
+ : Test cleanup of a wildcard out of the testscript working directory.
+ :
+ $c <'$* &../../a/***';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: wildcard cleanup \.\.[/\\]\.\.[/\\]a[/\\]\*\*\* is out of working directory test[/\\]%
+ EOE
+
+ : in-wd
+ :
+ : Test cleanup registration of a wildcard matching the directory that being
+ : outside the test working directory is inside the testscript working
+ : directory.
+ :
+ $c <'$* &../a/***';
+ $b 2>>~%EOE% != 0
+ %testscript:1: error: registered for cleanup wildcard test[/\\]a[/\\]\*\*\* doesn't match a directory%
+ EOE
+
+ : not-dir
+ :
+ : Test cleanup of a file as a wildcard. Note that there is an optional
+ : trailing blank line in the regex that matches the newline added by msvcrt
+ : as a part of the error description.
+ :
+ $c <'$* -f a &a/***';
+ $b 2>>~%EOE% != 0
+ %error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
+ %%?
+ EOE
+}
: order
:
@@ -84,141 +229,6 @@ $b
$c <'$* -d a/b &a/ &a/b/';
$b
-# Invalid cleanups.
-#
-: file-not-exists
-:
-: Test cleanup of non-existing file.
-:
-$c <'$* &a';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup file test[/\\]1[/\\]a does not exist%
-EOE
-
-: file-out-wd
-:
-: Test explicit cleanup of a file out of the testscript working directory.
-:
-$c <'$* &../../a';
-$b 2>>~%EOE% != 0
-%testscript:1: error: file cleanup \.\.[/\\]\.\.[/\\]a is out of working directory test[/\\]%
-EOE
-
-: file-in-wd
-:
-: Test cleanup explicit registration of a file being outside the test working
-: directory but inside the script working directory.
-:
-$c <'$* &../a';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup file test[/\\]a does not exist%
-EOE
-
-: not-file
-:
-: Test cleanup of a directory as a file.
-:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
-$c <'$* -d a &a';
-$b 2>>~%EOE% != 0
-%error: unable to remove file test[/\\]1[/\\]a: .+%
-%%?
-EOE
-
-: dir-not-exists
-:
-: Test cleanup of non-existing directory.
-:
-$c <'$* &a/';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup directory test[/\\]1[/\\]a[/\\] does not exist%
-EOE
-
-: dir-out-wd
-:
-: Test cleanup of a directory out of the testscript working directory.
-:
-$c <'$* &../../a/';
-$b 2>>~%EOE% != 0
-%testscript:1: error: directory cleanup \.\.[/\\]\.\.[/\\]a[/\\] is out of working directory test[/\\]%
-EOE
-
-: dir-in-wd
-:
-: Test cleanup explicit registration of a directory being outside the test
-: working directory but inside the testscript working directory.
-:
-$c <'$* &../a/';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup directory test[/\\]a[/\\] does not exist%
-EOE
-
-: dir-not-empty
-:
-: Test cleanup of a non-empty directory.
-:
-$c <'$* -d a -f a/b &a/';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup directory test[/\\]1[/\\]a[/\\] is not empty%
-EOE
-
-: not-dir
-:
-: Test cleanup of a file as a directory.
-:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
-$c <'$* -f a &a/';
-$b 2>>~%EOE% != 0
-%error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
-%%?
-EOE
-
-: wildcard-not-exists
-:
-: Test cleanup of a wildcard not matching any directory.
-:
-$c <'$* &a/***';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup wildcard test[/\\]1[/\\]a[/\\]\*\*\* doesn't match a directory%
-EOE
-
-: wildcard-out-wd
-:
-: Test cleanup of a wildcard out of the testscript working directory.
-:
-$c <'$* &../../a/***';
-$b 2>>~%EOE% != 0
-%testscript:1: error: wildcard cleanup \.\.[/\\]\.\.[/\\]a[/\\]\*\*\* is out of working directory test[/\\]%
-EOE
-
-: wildcard-in-wd
-:
-: Test cleanup registration of a wildcard matching the directory that being
-: outside the test working directory is inside the testscript working
-: directory.
-:
-$c <'$* &../a/***';
-$b 2>>~%EOE% != 0
-%testscript:1: error: registered for cleanup wildcard test[/\\]a[/\\]\*\*\* doesn't match a directory%
-EOE
-
-: wildcard-not-dir
-:
-: Test cleanup of a file as a wildcard.
-:
-: Note that there is an optional trailing blank line in the regex that matches
-: the newline added by msvcrt as a part of the error description.
-:
-$c <'$* -f a &a/***';
-$b 2>>~%EOE% != 0
-%error: unable to remove directory test[/\\]1[/\\]a[/\\]: .+%
-%%?
-EOE
-
: implicit-overwrite
:
: Test an implicit cleanup being overwritten with the explicit one,