Testsuite: added circular include tests.

src/lib-sieve/plugins/include/ext-include-common.c

@@ -60,25 +60,22 @@ const char *ext_include_get_script_directory
 
         if (sieve_dir == NULL)
             sieve_dir = getenv("HOME");
-        if (sieve_dir == NULL) {
-            sieve_sys_error("include: sieve_dir and home not set "
-                   "(wanted script %s)", str_sanitize(script_name, 80));
-            return NULL;
-        }
 		break;
    	case EXT_INCLUDE_LOCATION_GLOBAL:
 		sieve_dir = getenv("SIEVE_GLOBAL_DIR");
-
-        if (sieve_dir == NULL) {
-            sieve_sys_warning("include: sieve_global_dir not set "
-                   "(wanted script %s)", str_sanitize(script_name, 80));
-            return NULL;
-        }
 		break;
 	default:
 		return NULL;
 	}
 
+	if (sieve_dir == NULL) {
+		sieve_sys_error("include: sieve_dir and home not set "	
+			"(wanted script %s)", str_sanitize(script_name, 80));
+		return NULL;
+	}
+
+	printf("SIEVE DIR: %s\n", sieve_dir);
+
 	return sieve_dir;
 }
 

src/testsuite/testsuite-common.c

@@ -4,6 +4,7 @@
 #include "ostream.h"
 #include "hash.h"
 #include "mail-storage.h"
+#include "env-util.h"
 
 #include "mail-raw.h"
 #include "namespaces.h"
@@ -301,6 +302,8 @@ static void _testsuite_script_verror
 
 	msg.location = p_strdup(pool, location);
 	msg.message = p_strdup_vprintf(pool, fmt, args);
+
+//	printf("error: %s: %s.\n", location, t_strdup_vprintf(fmt, args));
 	
 	array_append(&_testsuite_script_errors, &msg, 1);	
 }
@@ -370,9 +373,21 @@ static void testsuite_script_init(void)
 bool testsuite_script_compile(const char *script_path)
 {
 	struct sieve_binary *sbin;
+	const char *sieve_dir;
 
 	testsuite_script_clear_messages();
 
+	    /* Initialize environment */
+    sieve_dir = strrchr(script_path, '/');
+    if ( sieve_dir == NULL )
+        sieve_dir= "./";
+    else
+        sieve_dir = t_strdup_until(script_path, sieve_dir+1);
+
+    /* Currently needed for include (FIXME) */
+    env_put(t_strconcat("SIEVE_DIR=", sieve_dir, "included", NULL));
+    env_put(t_strconcat("SIEVE_GLOBAL_DIR=", sieve_dir, "included-global", NULL));
+
     if ( (sbin = sieve_compile(script_path, test_script_ehandler)) == NULL )
         return FALSE;
 

src/testsuite/testsuite.c

@@ -61,7 +61,6 @@ static void testsuite_bin_init(void)
 	
 	testsuite_init();
 }
-
 static void testsuite_bin_deinit(void)
 {
 	testsuite_deinit();
@@ -216,11 +215,13 @@ int main(int argc, char **argv)
 	/* Initialize environment */
 	sieve_dir = strrchr(scriptfile, '/');
     if ( sieve_dir == NULL )
-        sieve_dir="./";
+        sieve_dir= "./";
 	else
-		sieve_dir = t_strdup_until(scriptfile, sieve_dir);
+		sieve_dir = t_strdup_until(scriptfile, sieve_dir+1);
 
-	env_put(t_strconcat("SIEVE_DIR=", sieve_dir, NULL));
+	/* Currently needed for include (FIXME) */
+	env_put(t_strconcat("SIEVE_DIR=", sieve_dir, "included", NULL));
+	env_put(t_strconcat("SIEVE_GLOBAL_DIR=", sieve_dir, "included-global", NULL));
 	
 	/* Compile sieve script */
 	sbin = _compile_sieve_script(scriptfile);

tests/extensions/include/errors.svtest

@@ -17,6 +17,36 @@ test "Generic" {
 	}
 }
 
+test "Circular - direct" {
+	if test_compile "errors/circular-1.sieve" {
+		test_fail "compile should have failed";
+	}
+
+	if not test_error :count "eq" :comparator "i;ascii-numeric" "3" {
+		test_fail "wrong number of errors reported";
+	}
+}
+
+test "Circular - one intermittent" {
+	if test_compile "errors/circular-2.sieve" {
+		test_fail "compile should have failed";
+	}
+
+	if not test_error :count "eq" :comparator "i;ascii-numeric" "4" {
+		test_fail "wrong number of errors reported";
+	}
+}
+
+test "Circular - two intermittent" {
+	if test_compile "errors/circular-3.sieve" {
+		test_fail "compile should have failed";
+	}
+
+	if not test_error :count "eq" :comparator "i;ascii-numeric" "5" {
+		test_fail "wrong number of errors reported";
+	}
+}
+
 /*
  * Using import/export without variables required
  */

tests/extensions/include/errors/circular-1.sieve

+require "include";
+
+discard;
+
+include "circular-one.sieve";

tests/extensions/include/errors/circular-2.sieve

+require "include";
+
+discard;
+
+include "circular-two.sieve";

tests/extensions/include/errors/circular-3.sieve

+require "include";
+
+discard;
+
+include "circular-three";

tests/extensions/include/errors/included/circular-one.sieve

+require "include";
+
+keep;
+
+include "circular-one.sieve";

tests/extensions/include/errors/included/circular-three-2.sieve

+require "include";
+
+include "circular-three-3.sieve";

tests/extensions/include/errors/included/circular-three-3.sieve

+require "include";
+
+include "circular-three.sieve";

tests/extensions/include/errors/included/circular-three.sieve

+require "include";
+
+keep;
+
+include "circular-three-2.sieve";
+
+

tests/extensions/include/errors/included/circular-two-2.sieve

+require "include";
+
+include "circular-two.sieve";

tests/extensions/include/errors/included/circular-two.sieve

+require "include";
+
+keep;
+
+include "circular-two-2.sieve";
+
+