diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 976cb5676565d7b9cdb41f8ad522acdbfac26d5a..6e1c8e14cde8a3b0901ebcb861711e7e0d624820 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -39,8 +39,8 @@ commands = \
cmd-test-set.c
tests = \
- tst-test-compile.c \
- tst-test-execute.c \
+ tst-test-script-compile.c \
+ tst-test-script-run.c \
tst-test-error.c \
tst-test-result.c
diff --git a/src/testsuite/ext-testsuite.c b/src/testsuite/ext-testsuite.c
index f62cb19478bf3dba21f6a8287ab57f4aa0117cd7..79ce4fa832570eb1c12ab4a8c0c8014844b1ad25 100644
--- a/src/testsuite/ext-testsuite.c
+++ b/src/testsuite/ext-testsuite.c
@@ -56,8 +56,8 @@ const struct sieve_operation *testsuite_operations[] = {
&test_finish_operation,
&test_fail_operation,
&test_set_operation,
- &test_compile_operation,
- &test_execute_operation,
+ &test_script_compile_operation,
+ &test_script_run_operation,
&test_error_operation,
&test_result_operation
};
@@ -106,8 +106,8 @@ static bool ext_testsuite_validator_load(struct sieve_validator *valdtr)
sieve_validator_register_command(valdtr, &cmd_test_fail);
sieve_validator_register_command(valdtr, &cmd_test_set);
- sieve_validator_register_command(valdtr, &tst_test_compile);
- sieve_validator_register_command(valdtr, &tst_test_execute);
+ sieve_validator_register_command(valdtr, &tst_test_script_compile);
+ sieve_validator_register_command(valdtr, &tst_test_script_run);
sieve_validator_register_command(valdtr, &tst_test_error);
sieve_validator_register_command(valdtr, &tst_test_result);
diff --git a/src/testsuite/testsuite-common.c b/src/testsuite/testsuite-common.c
index c349ebce90fe6bca1a55259630b5e862765f359d..5147dd0bd1cf240760e32e158c60e2ef0e05fc3f 100644
--- a/src/testsuite/testsuite-common.c
+++ b/src/testsuite/testsuite-common.c
@@ -415,7 +415,7 @@ bool testsuite_script_compile(const char *script_path)
return TRUE;
}
-bool testsuite_script_execute(const struct sieve_runtime_env *renv)
+bool testsuite_script_run(const struct sieve_runtime_env *renv)
{
struct sieve_script_env scriptenv;
struct sieve_exec_status estatus;
diff --git a/src/testsuite/testsuite-common.h b/src/testsuite/testsuite-common.h
index a0c09e0e850df548ccbbe5f9a740b4d858d7ee34..636ee2a379d42ef86b158af705fc387435367b3b 100644
--- a/src/testsuite/testsuite-common.h
+++ b/src/testsuite/testsuite-common.h
@@ -60,8 +60,8 @@ extern const struct sieve_command cmd_test_set;
* Tests
*/
-extern const struct sieve_command tst_test_compile;
-extern const struct sieve_command tst_test_execute;
+extern const struct sieve_command tst_test_script_compile;
+extern const struct sieve_command tst_test_script_run;
extern const struct sieve_command tst_test_error;
extern const struct sieve_command tst_test_result;
@@ -74,8 +74,8 @@ enum testsuite_operation_code {
TESTSUITE_OPERATION_TEST_FINISH,
TESTSUITE_OPERATION_TEST_FAIL,
TESTSUITE_OPERATION_TEST_SET,
- TESTSUITE_OPERATION_TEST_COMPILE,
- TESTSUITE_OPERATION_TEST_EXECUTE,
+ TESTSUITE_OPERATION_TEST_SCRIPT_COMPILE,
+ TESTSUITE_OPERATION_TEST_SCRIPT_RUN,
TESTSUITE_OPERATION_TEST_ERROR,
TESTSUITE_OPERATION_TEST_RESULT
};
@@ -84,8 +84,8 @@ extern const struct sieve_operation test_operation;
extern const struct sieve_operation test_finish_operation;
extern const struct sieve_operation test_fail_operation;
extern const struct sieve_operation test_set_operation;
-extern const struct sieve_operation test_compile_operation;
-extern const struct sieve_operation test_execute_operation;
+extern const struct sieve_operation test_script_compile_operation;
+extern const struct sieve_operation test_script_run_operation;
extern const struct sieve_operation test_error_operation;
extern const struct sieve_operation test_result_operation;
@@ -117,7 +117,7 @@ int testsuite_testcase_result(void);
*/
bool testsuite_script_compile(const char *script_path);
-bool testsuite_script_execute(const struct sieve_runtime_env *renv);
+bool testsuite_script_run(const struct sieve_runtime_env *renv);
void testsuite_script_get_error_init(void);
const char *testsuite_script_get_error_next(bool location);
diff --git a/src/testsuite/tst-test-result.c b/src/testsuite/tst-test-result.c
index c417789cb3c75ba826b27d46fabcfab8c566ff25..498898d18c675d2d623542d4d73353f95a7e046d 100644
--- a/src/testsuite/tst-test-result.c
+++ b/src/testsuite/tst-test-result.c
@@ -29,7 +29,8 @@
* test_result command
*
* Syntax:
- * test [MATCH-TYPE] [COMPARATOR] [:index number] <key-list: string-list>
+ * test_result [MATCH-TYPE] [COMPARATOR] [:index number]
+ * <key-list: string-list>
*/
static bool tst_test_result_registered
diff --git a/tests/compile/compile.svtest b/tests/compile/compile.svtest
index 5a54d6b558b985dd25a89f211cdfdb42479e5aeb..7abda7f4c982960b47fcfde4e693631633eec179 100644
--- a/tests/compile/compile.svtest
+++ b/tests/compile/compile.svtest
@@ -3,13 +3,13 @@ require "vnd.dovecot.testsuite";
# Just test whether valid scripts will compile without problems
test "Trivial" {
- if not test_compile "trivial.sieve" {
+ if not test_script_compile "trivial.sieve" {
test_fail "could not compile";
}
}
test "Redirect" {
- if not test_compile "redirect.sieve" {
+ if not test_script_compile "redirect.sieve" {
test_fail "could not compile";
}
}
diff --git a/tests/compile/errors.svtest b/tests/compile/errors.svtest
index 8899cf92367ab5ccd3c1a0d5f8caac9bc513912a..a5a876882fd18e2110e5b1e9c27e3818e430e8f8 100644
--- a/tests/compile/errors.svtest
+++ b/tests/compile/errors.svtest
@@ -13,7 +13,7 @@ require "comparator-i;ascii-numeric";
*/
test "Lexer errors (FIXME: count only)" {
- if test_compile "errors/lexer.sieve" {
+ if test_script_compile "errors/lexer.sieve" {
test_fail "compile should have failed.";
}
@@ -27,7 +27,7 @@ test "Lexer errors (FIXME: count only)" {
*/
test "Parser errors (FIXME: count only)" {
- if test_compile "errors/parser.sieve" {
+ if test_script_compile "errors/parser.sieve" {
test_fail "compile should have failed.";
}
@@ -41,7 +41,7 @@ test "Parser errors (FIXME: count only)" {
*/
test "Header errors" {
- if test_compile "errors/header.sieve" {
+ if test_script_compile "errors/header.sieve" {
test_fail "compile should have failed.";
}
@@ -105,7 +105,7 @@ test "Header errors" {
test "Address errors" {
- if test_compile "errors/address.sieve" {
+ if test_script_compile "errors/address.sieve" {
test_fail "compile should have failed.";
}
@@ -163,7 +163,7 @@ test "Address errors" {
*/
test "If errors (FIXME: count only)" {
- if test_compile "errors/if.sieve" {
+ if test_script_compile "errors/if.sieve" {
test_fail "compile should have failed.";
}
@@ -177,7 +177,7 @@ test "If errors (FIXME: count only)" {
*/
test "Require errors (FIXME: count only)" {
- if test_compile "errors/require.sieve" {
+ if test_script_compile "errors/require.sieve" {
test_fail "compile should have failed.";
}
@@ -191,7 +191,7 @@ test "Require errors (FIXME: count only)" {
*/
test "Size errors (FIXME: count only)" {
- if test_compile "errors/size.sieve" {
+ if test_script_compile "errors/size.sieve" {
test_fail "compile should have failed.";
}
@@ -205,7 +205,7 @@ test "Size errors (FIXME: count only)" {
*/
test "Envelope errors (FIXME: count only)" {
- if test_compile "errors/envelope.sieve" {
+ if test_script_compile "errors/envelope.sieve" {
test_fail "compile should have failed.";
}
@@ -219,7 +219,7 @@ test "Envelope errors (FIXME: count only)" {
*/
test "Stop errors (FIXME: count only)" {
- if test_compile "errors/stop.sieve" {
+ if test_script_compile "errors/stop.sieve" {
test_fail "compile should have failed.";
}
@@ -233,7 +233,7 @@ test "Stop errors (FIXME: count only)" {
*/
test "Keep errors (FIXME: count only)" {
- if test_compile "errors/keep.sieve" {
+ if test_script_compile "errors/keep.sieve" {
test_fail "compile should have failed.";
}
@@ -247,7 +247,7 @@ test "Keep errors (FIXME: count only)" {
*/
test "ADDRESS-PART errors (FIXME: count only)" {
- if test_compile "errors/address-part.sieve" {
+ if test_script_compile "errors/address-part.sieve" {
test_fail "compile should have failed.";
}
@@ -261,7 +261,7 @@ test "ADDRESS-PART errors (FIXME: count only)" {
*/
test "MATCH-TYPE errors (FIXME: count only)" {
- if test_compile "errors/match-type.sieve" {
+ if test_script_compile "errors/match-type.sieve" {
test_fail "compile should have failed.";
}
@@ -275,7 +275,7 @@ test "MATCH-TYPE errors (FIXME: count only)" {
*/
test "Encoded-character errors (FIXME: count only)" {
- if test_compile "errors/encoded-character.sieve" {
+ if test_script_compile "errors/encoded-character.sieve" {
test_fail "compile should have failed.";
}
@@ -289,7 +289,7 @@ test "Encoded-character errors (FIXME: count only)" {
*/
test "Outgoing address errors (FIXME: count only)" {
- if test_compile "errors/out-address.sieve" {
+ if test_script_compile "errors/out-address.sieve" {
test_fail "compile should have failed.";
}
@@ -304,7 +304,7 @@ test "Outgoing address errors (FIXME: count only)" {
*/
test "Tagged argument errors (FIXME: count only)" {
- if test_compile "errors/tag.sieve" {
+ if test_script_compile "errors/tag.sieve" {
test_fail "compile should have failed.";
}
@@ -318,7 +318,7 @@ test "Tagged argument errors (FIXME: count only)" {
*/
test "Typos" {
- if test_compile "errors/typos.sieve" {
+ if test_script_compile "errors/typos.sieve" {
test_fail "compile should have failed.";
}
@@ -358,7 +358,7 @@ test "Typos" {
*/
test "Unsupported language features (FIXME: count only)" {
- if test_compile "errors/unsupported.sieve" {
+ if test_script_compile "errors/unsupported.sieve" {
test_fail "compile should have failed.";
}
diff --git a/tests/compile/examples.svtest b/tests/compile/examples.svtest
index efae69b2e492054ff030c5ce2ee28a26e88b9160..2de85425e3237a2b0393a28d3e5b739972d2f90b 100644
--- a/tests/compile/examples.svtest
+++ b/tests/compile/examples.svtest
@@ -3,61 +3,61 @@ require "vnd.dovecot.testsuite";
# Compile all example scripts
test "Elvey example" {
- if not test_compile "../../examples/elvey.sieve" {
+ if not test_script_compile "../../examples/elvey.sieve" {
test_fail "could not compile";
}
}
test "M. Johnson example" {
- if not test_compile "../../examples/mjohnson.sieve" {
+ if not test_script_compile "../../examples/mjohnson.sieve" {
test_fail "could not compile";
}
}
test "RFC 3028 example" {
- if not test_compile "../../examples/rfc3028.sieve" {
+ if not test_script_compile "../../examples/rfc3028.sieve" {
test_fail "could not compile";
}
}
test "Sieve examples" {
- if not test_compile "../../examples/sieve_examples.sieve" {
+ if not test_script_compile "../../examples/sieve_examples.sieve" {
test_fail "could not compile";
}
}
test "Vivil example" {
- if not test_compile "../../examples/vivil.sieve" {
+ if not test_script_compile "../../examples/vivil.sieve" {
test_fail "could not compile";
}
}
test "Jerry example" {
- if not test_compile "../../examples/jerry.sieve" {
+ if not test_script_compile "../../examples/jerry.sieve" {
test_fail "could not compile";
}
}
test "M. Klose example" {
- if not test_compile "../../examples/mklose.sieve" {
+ if not test_script_compile "../../examples/mklose.sieve" {
test_fail "could not compile";
}
}
test "Sanjay example" {
- if not test_compile "../../examples/sanjay.sieve" {
+ if not test_script_compile "../../examples/sanjay.sieve" {
test_fail "could not compile";
}
}
test "Relational (RFC5231) example" {
- if not test_compile "../../examples/relational.rfc5231.sieve" {
+ if not test_script_compile "../../examples/relational.rfc5231.sieve" {
test_fail "could not compile";
}
}
test "Subaddress (RFC5233) example" {
- if not test_compile "../../examples/subaddress.rfc5233.sieve" {
+ if not test_script_compile "../../examples/subaddress.rfc5233.sieve" {
test_fail "could not compile";
}
}
diff --git a/tests/execute/actions.svtest b/tests/execute/actions.svtest
index d7c2b1d1f4fcac8a4d2829c78a1ae4ba3dc26167..c5dbee76911718abc7934d6a0e0ebfc8c1d25402 100644
--- a/tests/execute/actions.svtest
+++ b/tests/execute/actions.svtest
@@ -12,11 +12,11 @@ Test.
;
test "Fileinto" {
- if not test_compile "actions/fileinto.sieve" {
+ if not test_script_compile "actions/fileinto.sieve" {
test_fail "compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "execute failed";
}
@@ -38,11 +38,11 @@ test "Fileinto" {
}
test "Redirect" {
- if not test_compile "actions/redirect.sieve" {
+ if not test_script_compile "actions/redirect.sieve" {
test_fail "compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "execute failed";
}
diff --git a/tests/execute/errors.svtest b/tests/execute/errors.svtest
index 2ebc550262415084dcbb1d5bfd32a0ae32710f34..605b629729d4f6204119828f6bb369c46e9e8695 100644
--- a/tests/execute/errors.svtest
+++ b/tests/execute/errors.svtest
@@ -4,11 +4,11 @@ require "relational";
require "comparator-i;ascii-numeric";
test "Action conflicts: reject <-> fileinto" {
- if not test_compile "errors/conflict-reject-fileinto.sieve" {
+ if not test_script_compile "errors/conflict-reject-fileinto.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
@@ -18,11 +18,11 @@ test "Action conflicts: reject <-> fileinto" {
}
test "Action conflicts: reject <-> keep" {
- if not test_compile "errors/conflict-reject-keep.sieve" {
+ if not test_script_compile "errors/conflict-reject-keep.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
@@ -32,11 +32,11 @@ test "Action conflicts: reject <-> keep" {
}
test "Action conflicts: reject <-> redirect" {
- if not test_compile "errors/conflict-reject-redirect.sieve" {
+ if not test_script_compile "errors/conflict-reject-redirect.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
@@ -46,11 +46,11 @@ test "Action conflicts: reject <-> redirect" {
}
test "Action limit" {
- if not test_compile "errors/actions-limit.sieve" {
+ if not test_script_compile "errors/actions-limit.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
@@ -64,11 +64,11 @@ test "Action limit" {
}
test "Redirect limit" {
- if not test_compile "errors/redirect-limit.sieve" {
+ if not test_script_compile "errors/redirect-limit.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
diff --git a/tests/extensions/enotify/errors.svtest b/tests/extensions/enotify/errors.svtest
index 7c1a5fbfbf4c40dbfb4b44a23749402d3c7157f6..0fa19b60172337f58a21bc78c4819f4219f11fce 100644
--- a/tests/extensions/enotify/errors.svtest
+++ b/tests/extensions/enotify/errors.svtest
@@ -5,7 +5,7 @@ require "relational";
require "enotify";
test "Invalid URI (FIXME: count only)" {
- if test_compile "errors/uri.sieve" {
+ if test_script_compile "errors/uri.sieve" {
test_fail "compile should have failed";
}
@@ -15,7 +15,7 @@ test "Invalid URI (FIXME: count only)" {
}
test "Invalid mailto URI (FIXME: count only)" {
- if test_compile "errors/uri-mailto.sieve" {
+ if test_script_compile "errors/uri-mailto.sieve" {
test_fail "compile should have failed";
}
@@ -25,7 +25,7 @@ test "Invalid mailto URI (FIXME: count only)" {
}
test "Invalid mailto :from address (FIXME: count only)" {
- if test_compile "errors/from-mailto.sieve" {
+ if test_script_compile "errors/from-mailto.sieve" {
test_fail "compile should have failed";
}
@@ -35,7 +35,7 @@ test "Invalid mailto :from address (FIXME: count only)" {
}
test "Invalid :options argument (FIXME: count only)" {
- if test_compile "errors/options.sieve" {
+ if test_script_compile "errors/options.sieve" {
test_fail "compile should have failed";
}
diff --git a/tests/extensions/enotify/execute.svtest b/tests/extensions/enotify/execute.svtest
index 542d5c222dc13527ee3238931696da7de72f4db1..625a3a0d1f887f13bed12e53096e6e98e36cfb60 100644
--- a/tests/extensions/enotify/execute.svtest
+++ b/tests/extensions/enotify/execute.svtest
@@ -5,32 +5,32 @@ require "vnd.dovecot.testsuite";
*/
test "RFC Example 1" {
- if not test_compile "execute/draft-rfc-ex1.sieve" {
+ if not test_script_compile "execute/draft-rfc-ex1.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
test "RFC Example 2" {
- if not test_compile "execute/draft-rfc-ex2.sieve" {
+ if not test_script_compile "execute/draft-rfc-ex2.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
/* tel: not supported
test "RFC Example 3" {
- if not test_compile "execute/draft-rfc-ex3.sieve" {
+ if not test_script_compile "execute/draft-rfc-ex3.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
@@ -38,22 +38,22 @@ test "RFC Example 3" {
/* tel: and xmmp: not supported
test "RFC Example 5" {
- if not test_compile "execute/draft-rfc-ex5.sieve" {
+ if not test_script_compile "execute/draft-rfc-ex5.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
*/
test "RFC Example 6" {
- if not test_compile "execute/draft-rfc-ex6.sieve" {
+ if not test_script_compile "execute/draft-rfc-ex6.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
diff --git a/tests/extensions/imapflags/execute.svtest b/tests/extensions/imapflags/execute.svtest
index 5ecbb2ca8490a82ed763077d74f077ecd7956605..35cc95924e33620ff114938c4125f4b65ff4be86 100644
--- a/tests/extensions/imapflags/execute.svtest
+++ b/tests/extensions/imapflags/execute.svtest
@@ -5,11 +5,11 @@ require "vnd.dovecot.testsuite";
*/
test "Flags Side Effect" {
- if not test_compile "execute/flags-side-effect.sieve" {
+ if not test_script_compile "execute/flags-side-effect.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
diff --git a/tests/extensions/include/errors.svtest b/tests/extensions/include/errors.svtest
index 7c712317b14bfe8ef733717f93d39c00dc194d03..233f027c16f5c457185472efe6141a4a16554990 100644
--- a/tests/extensions/include/errors.svtest
+++ b/tests/extensions/include/errors.svtest
@@ -8,7 +8,7 @@ require "comparator-i;ascii-numeric";
*/
test "Generic" {
- if test_compile "errors/generic.sieve" {
+ if test_script_compile "errors/generic.sieve" {
test_fail "compile should have failed";
}
@@ -18,7 +18,7 @@ test "Generic" {
}
test "Circular - direct" {
- if test_compile "errors/circular-1.sieve" {
+ if test_script_compile "errors/circular-1.sieve" {
test_fail "compile should have failed";
}
@@ -28,7 +28,7 @@ test "Circular - direct" {
}
test "Circular - one intermittent" {
- if test_compile "errors/circular-2.sieve" {
+ if test_script_compile "errors/circular-2.sieve" {
test_fail "compile should have failed";
}
@@ -38,7 +38,7 @@ test "Circular - one intermittent" {
}
test "Circular - two intermittent" {
- if test_compile "errors/circular-3.sieve" {
+ if test_script_compile "errors/circular-3.sieve" {
test_fail "compile should have failed";
}
@@ -52,7 +52,7 @@ test "Circular - two intermittent" {
*/
test "Variables inactive" {
- if test_compile "errors/variables-inactive.sieve" {
+ if test_script_compile "errors/variables-inactive.sieve" {
test_fail "compile should have failed";
}
@@ -66,7 +66,7 @@ test "Variables inactive" {
*/
test "Variables" {
- if test_compile "errors/variables.sieve" {
+ if test_script_compile "errors/variables.sieve" {
test_fail "compile should have failed";
}
@@ -80,11 +80,11 @@ test "Variables" {
*/
test "Import runtime" {
- if not test_compile "errors/import-runtime.sieve" {
+ if not test_script_compile "errors/import-runtime.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
diff --git a/tests/extensions/regex/errors.svtest b/tests/extensions/regex/errors.svtest
index 0946a6fe0a700f6f0dc1c9d4cfa64b20d0865830..79c4115e3f544a9f2d81b297b643fef5b299ef41 100644
--- a/tests/extensions/regex/errors.svtest
+++ b/tests/extensions/regex/errors.svtest
@@ -4,7 +4,7 @@ require "relational";
require "comparator-i;ascii-numeric";
test "Compile errors" {
- if test_compile "errors/compile.sieve" {
+ if test_script_compile "errors/compile.sieve" {
test_fail "compile should have failed";
}
diff --git a/tests/extensions/reject/execute.svtest b/tests/extensions/reject/execute.svtest
index 840ee27157ae381d3c422fe8c14b95232dd3d674..911a978aa06a104b2d2774d8d47d92e660da2ae7 100644
--- a/tests/extensions/reject/execute.svtest
+++ b/tests/extensions/reject/execute.svtest
@@ -12,11 +12,11 @@ Test.
;
test "Execute" {
- if not test_compile "execute/basic.sieve" {
+ if not test_script_compile "execute/basic.sieve" {
test_fail "compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "execute failed";
}
diff --git a/tests/extensions/relational/errors.svtest b/tests/extensions/relational/errors.svtest
index ed9f268ecfe2537281bb25b0adaa0b5230b1570a..927475af1c7125faf213c3ad62136cb7aa4765bc 100644
--- a/tests/extensions/relational/errors.svtest
+++ b/tests/extensions/relational/errors.svtest
@@ -5,7 +5,7 @@ require "relational";
require "comparator-i;ascii-numeric";
test "Validation errors" {
- if test_compile "errors/validation.sieve" {
+ if test_script_compile "errors/validation.sieve" {
test_fail "compile should have failed";
}
diff --git a/tests/extensions/vacation/errors.svtest b/tests/extensions/vacation/errors.svtest
index aa23b485dbea13e45e2cad3de2b78cae651b55a9..88bd776d575f89c5baaac5d39ac4b3d82676d394 100644
--- a/tests/extensions/vacation/errors.svtest
+++ b/tests/extensions/vacation/errors.svtest
@@ -4,11 +4,11 @@ require "relational";
require "comparator-i;ascii-numeric";
test "Action conflicts: reject <-> vacation" {
- if not test_compile "errors/conflict-reject.sieve" {
+ if not test_script_compile "errors/conflict-reject.sieve" {
test_fail "compile failed";
}
- if test_execute {
+ if test_script_run {
test_fail "execution should have failed";
}
diff --git a/tests/extensions/vacation/execute.svtest b/tests/extensions/vacation/execute.svtest
index a8cdd6b8893d71c2b097c8ea6286adfe0dbc8945..0b68b44f85f37904601568ca586049cda38e856d 100644
--- a/tests/extensions/vacation/execute.svtest
+++ b/tests/extensions/vacation/execute.svtest
@@ -3,11 +3,11 @@ require "relational";
require "comparator-i;ascii-numeric";
test "Action" {
- if not test_compile "execute/action.sieve" {
+ if not test_script_compile "execute/action.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
@@ -25,11 +25,11 @@ test "Action" {
}
test "No :handle specified" {
- if not test_compile "execute/no-handle.sieve" {
+ if not test_script_compile "execute/no-handle.sieve" {
test_fail "script compile failed";
}
- if not test_execute {
+ if not test_script_run {
test_fail "script execute failed";
}
}
diff --git a/tests/extensions/variables/errors.svtest b/tests/extensions/variables/errors.svtest
index 139e448b5fc40f7a45c3226abd60f3aaa9b1b358..652075f08e7965e383c255f430d70bad3a86c773 100644
--- a/tests/extensions/variables/errors.svtest
+++ b/tests/extensions/variables/errors.svtest
@@ -4,7 +4,7 @@ require "comparator-i;ascii-numeric";
require "relational";
test "Invalid namespaces (FIXME: count only)" {
- if test_compile "errors/namespace.sieve" {
+ if test_script_compile "errors/namespace.sieve" {
test_fail "compile should have failed";
}
@@ -14,7 +14,7 @@ test "Invalid namespaces (FIXME: count only)" {
}
test "Invalid set command invocations (FIXME: count only)" {
- if test_compile "errors/set.sieve" {
+ if test_script_compile "errors/set.sieve" {
test_fail "compile should have failed";
}
@@ -24,7 +24,7 @@ test "Invalid set command invocations (FIXME: count only)" {
}
test "Limits (FIXME: count only)" {
- if test_compile "errors/limits.sieve" {
+ if test_script_compile "errors/limits.sieve" {
test_fail "compile should have failed";
}
diff --git a/tests/testsuite.svtest b/tests/testsuite.svtest
index 9e4823ccb9914b1f18984ff66a9f88cdf3995fcc..724a7161b3ac7ef13d817a11ba36439725bc6ea3 100644
--- a/tests/testsuite.svtest
+++ b/tests/testsuite.svtest
@@ -73,8 +73,3 @@ test "Envelope Environment" {
}
}
-/* Test substitutions */
-
-test "Substitutions" {
- test_fail "file substitution failed: %{file:frop}.";
-}