Testsuite: moved tests directory to the root of the package.

Makefile.am

 SUBDIRS = src
 
 EXTRA_DIST = \
+	tests \
 	sieve/* \
 	doc/* \
     COPYING.LGPL \
@@ -12,5 +13,35 @@ ChangeLog: .hg/dirstate
 	hg log --style=changelog > ChangeLog
 endif
 
-test:
-	$(MAKE) -C src/testsuite test
+# Testsuite tests
+
+TESTSUITE_BIN = $(top_srcdir)/src/testsuite/testsuite
+
+test_cases = \
+	tests/testsuite.svtest\
+	tests/control-structures.svtest \
+	tests/exists.svtest \
+	tests/lexer.svtest \
+	tests/comparators/core.svtest \
+	tests/match-types/is.svtest \
+	tests/match-types/contains.svtest \
+	tests/match-types/matches.svtest \
+	tests/match-types/relational.svtest \
+	tests/address-parts/subaddress.svtest \
+	tests/extensions/encoded-character.svtest \
+	tests/extensions/envelope.svtest \
+	tests/extensions/variables/basic.svtest \
+	tests/extensions/variables/match.svtest \
+	tests/extensions/include/variables.svtest \
+	tests/extensions/imapflags/basic.svtest \
+	tests/extensions/imapflags/rfc.svtest \
+	tests/compile/compile.svtest \
+	tests/compile/compile-examples.svtest \
+	tests/compile/errors.svtest
+
+$(test_cases):
+	@$(TESTSUITE_BIN) $@
+
+.PHONY: $(test_cases)
+
+test: $(test_cases)

configure.in

@@ -54,9 +54,6 @@ AC_SUBST(MODULE_LIBS)
 AC_SUBST(dovecot_incdir)
 AC_SUBST(moduledir)
 
-TESTSUITE_BIN="\$(top_srcdir)/src/testsuite/testsuite"
-AC_SUBST(TESTSUITE_BIN)
-
 AC_CONFIG_FILES([
 Makefile
 src/Makefile

src/testsuite/Makefile.am

@@ -62,34 +62,3 @@ noinst_HEADERS = \
 	namespaces.h \
 	mail-raw.h
 
-# Testsuite tests
-
-EXTRA_DIST = tests
-
-test_cases = \
-    tests/testsuite.svtest\
-    tests/control-structures.svtest \
-	tests/exists.svtest \
-	tests/lexer.svtest \
-	tests/comparators/core.svtest \
-	tests/match-types/is.svtest \
-	tests/match-types/contains.svtest \
-	tests/match-types/matches.svtest \
-	tests/match-types/relational.svtest \
-	tests/address-parts/subaddress.svtest \
-	tests/extensions/encoded-character.svtest \
-	tests/extensions/envelope.svtest \
-	tests/extensions/variables/basic.svtest \
-	tests/extensions/variables/match.svtest \
-	tests/extensions/include/variables.svtest \
-	tests/extensions/imapflags/basic.svtest \
-	tests/extensions/imapflags/rfc.svtest \
-	tests/compile/compile.svtest \
-	tests/compile/compile-examples.svtest \
-	tests/compile/errors.svtest 
-
-$(test_cases): 
-	@$(TESTSUITE_BIN) $@
-.PHONY: $(test_cases)
-
-test: $(test_cases)

src/testsuite/tests/compile/compile-examples.svtest → tests/compile/compile-examples.svtest

@@ -3,49 +3,49 @@ require "vnd.dovecot.testsuite";
 # Compile all example scripts
 
 test "Elvey example" {
-	if not test_compile "../../../../sieve/examples/elvey.sieve" {
+	if not test_compile "../../sieve/examples/elvey.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "M. Johnson example" {
-	if not test_compile "../../../../sieve/examples/mjohnson.sieve" {
+	if not test_compile "../../sieve/examples/mjohnson.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "RFC 3028 example" {
-	if not test_compile "../../../../sieve/examples/rfc3028.sieve" {
+	if not test_compile "../../sieve/examples/rfc3028.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "Sieve examples" {
-	if not test_compile "../../../../sieve/examples/sieve_examples.sieve" {
+	if not test_compile "../../sieve/examples/sieve_examples.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "Vivil example" {
-	if not test_compile "../../../../sieve/examples/vivil.sieve" {
+	if not test_compile "../../sieve/examples/vivil.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "Jerry example" {
-	if not test_compile "../../../../sieve/examples/jerry.sieve" {
+	if not test_compile "../../sieve/examples/jerry.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "M. Klose example" {
-	if not test_compile "../../../../sieve/examples/mklose.sieve" {
+	if not test_compile "../../sieve/examples/mklose.sieve" {
 		test_fail "could not compile";
 	}
 }
 
 test "Sanjay example" {
-	if not test_compile "../../../../sieve/examples/sanjay.sieve" {
+	if not test_compile "../../sieve/examples/sanjay.sieve" {
 		test_fail "could not compile";
 	}
 }