dovecot-2.2-pigeonhole: Fixed distcheck failure on sieve_extprog...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/ee5a40db9e73
changeset: 1753:ee5a40db9e73
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Fri Apr 19 09:45:15 2013 +0200
description:
Fixed distcheck failure on sieve_extprograms plugin testsuite.

diffstat:

 src/testsuite/testsuite-variables.c                 |  2 +-
 tests/plugins/extprograms/bin/sleep10               |  3 +++
 tests/plugins/extprograms/execute/command.svtest    |  2 +-
 tests/plugins/extprograms/execute/errors.svtest     |  3 +++
 tests/plugins/extprograms/execute/execute.svtest    |  2 +-
 tests/plugins/extprograms/filter/command.svtest     |  2 +-
 tests/plugins/extprograms/filter/errors.svtest      |  3 +++
 tests/plugins/extprograms/filter/execute.svtest     |  2 +-
 tests/plugins/extprograms/pipe/command.svtest       |  2 +-
 tests/plugins/extprograms/pipe/errors.svtest        |  3 ++-
 tests/plugins/extprograms/pipe/errors/timeout.sieve |  2 +-
 tests/plugins/extprograms/pipe/execute.svtest       |  6 +++---
 12 files changed, 21 insertions(+), 11 deletions(-)

diffs (161 lines):

diff -r 2688c750b426 -r ee5a40db9e73 src/testsuite/testsuite-variables.c
--- a/src/testsuite/testsuite-variables.c	Fri Apr 19 09:15:01 2013 +0200
+++ b/src/testsuite/testsuite-variables.c	Fri Apr 19 09:45:15 2013 +0200
@@ -77,7 +77,7 @@
 	name_element = array_idx(var_name, 1);
 	if ( name_element->num_variable >= 0 ) {
 		sieve_argument_validate_error(valdtr, arg,
-			"testsuite: invalid variable name within testsuite namespace 'testsuite.%d': "
+			"testsuite: invalid variable name within testsuite namespace 'tst.%d': "
 			"encountered numeric variable name", name_element->num_variable);
 		return FALSE;
 	}
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/bin/sleep10
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/plugins/extprograms/bin/sleep10	Fri Apr 19 09:45:15 2013 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sleep 10
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/execute/command.svtest
--- a/tests/plugins/extprograms/execute/command.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/execute/command.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -2,7 +2,7 @@
 require "vnd.dovecot.execute";
 require "variables";
 
-test_config_set "sieve_execute_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_execute_bin_dir" "${tst.path}/../bin";
 test_config_reload :extension "vnd.dovecot.execute";
 
 test "Basic" {
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/execute/errors.svtest
--- a/tests/plugins/extprograms/execute/errors.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/execute/errors.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -3,6 +3,9 @@
 require "relational";
 require "comparator-i;ascii-numeric";
 
+test_config_set "sieve_execute_bin_dir" "${tst.path}/../bin";
+test_config_reload :extension "vnd.dovecot.execute";
+
 /*
  * Command syntax
  */
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/execute/execute.svtest
--- a/tests/plugins/extprograms/execute/execute.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/execute/execute.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -14,7 +14,7 @@
 .
 ;
 
-test_config_set "sieve_execute_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_execute_bin_dir" "${tst.path}/../bin";
 test_config_reload :extension "vnd.dovecot.execute";
 test_result_reset;
 
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/filter/command.svtest
--- a/tests/plugins/extprograms/filter/command.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/filter/command.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -2,7 +2,7 @@
 require "vnd.dovecot.filter";
 require "variables";
 
-test_config_set "sieve_filter_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_filter_bin_dir" "${tst.path}/../bin";
 test_config_reload :extension "vnd.dovecot.filter";
 
 test "Basic" {
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/filter/errors.svtest
--- a/tests/plugins/extprograms/filter/errors.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/filter/errors.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -7,6 +7,9 @@
  * Command syntax
  */
 
+test_config_set "sieve_filter_bin_dir" "${tst.path}/../bin";
+test_config_reload :extension "vnd.dovecot.filter";
+
 test "Command syntax" {
         if test_script_compile "errors/syntax.sieve" {
                 test_fail "compile should have failed";
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/filter/execute.svtest
--- a/tests/plugins/extprograms/filter/execute.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/filter/execute.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -16,7 +16,7 @@
 .
 ;
 
-test_config_set "sieve_filter_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_filter_bin_dir" "${tst.path}/../bin";
 test_config_reload :extension "vnd.dovecot.filter";
 test_result_reset;
 
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/pipe/command.svtest
--- a/tests/plugins/extprograms/pipe/command.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/pipe/command.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -1,7 +1,7 @@
 require "vnd.dovecot.testsuite";
 require "vnd.dovecot.pipe";
 
-test_config_set "sieve_pipe_dir" "./";
+test_config_set "sieve_pipe_bin_dir" "${tst.path}/../bin";
 test_config_reload :extension "vnd.dovecot.pipe";
 
 test "Basic" {
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/pipe/errors.svtest
--- a/tests/plugins/extprograms/pipe/errors.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/pipe/errors.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -1,4 +1,5 @@
 require "vnd.dovecot.testsuite";
+require "variables";
 
 require "relational";
 require "comparator-i;ascii-numeric";
@@ -28,7 +29,7 @@
 .
 ;
 
-test_config_set "sieve_pipe_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_pipe_bin_dir" "${tst.path}/../bin";
 test_config_set "sieve_pipe_exec_timeout" "1s";
 test_config_reload :extension "vnd.dovecot.pipe";
 test_result_reset;
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/pipe/errors/timeout.sieve
--- a/tests/plugins/extprograms/pipe/errors/timeout.sieve	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/pipe/errors/timeout.sieve	Fri Apr 19 09:45:15 2013 +0200
@@ -1,3 +1,3 @@
 require "vnd.dovecot.pipe";
 
-pipe "sleep2";
+pipe "sleep10";
diff -r 2688c750b426 -r ee5a40db9e73 tests/plugins/extprograms/pipe/execute.svtest
--- a/tests/plugins/extprograms/pipe/execute.svtest	Fri Apr 19 09:15:01 2013 +0200
+++ b/tests/plugins/extprograms/pipe/execute.svtest	Fri Apr 19 09:45:15 2013 +0200
@@ -14,7 +14,7 @@
 
 /* Basic pipe */
 
-test_config_set "sieve_pipe_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_pipe_bin_dir" "${tst.path}/../bin";
 test_config_reload :extension "vnd.dovecot.pipe";
 test_result_reset;
 
@@ -28,7 +28,7 @@
 
 /* Timeout */
 
-test_config_set "sieve_pipe_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_pipe_bin_dir" "${tst.path}/../bin";
 test_config_set "sieve_pipe_exec_timeout" "3s";
 test_config_reload :extension "vnd.dovecot.pipe";
 test_result_reset;
@@ -42,7 +42,7 @@
 }
 
 test_result_reset;
-test_config_set "sieve_pipe_bin_dir" "./tests/plugins/extprograms/bin";
+test_config_set "sieve_pipe_bin_dir" "${tst.path}/../bin";
 test_config_set "sieve_pipe_exec_timeout" "0";
 test_config_reload :extension "vnd.dovecot.pipe";
 test_result_reset;