aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog1
-rw-r--r--Makefile23
-rw-r--r--tests/interimap.list (renamed from tests/list)3
-rw-r--r--tests/pullimap.list2
-rwxr-xr-xtests/run-all3
5 files changed, 22 insertions, 10 deletions
diff --git a/Changelog b/Changelog
index 9549892..cad321b 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ interimap (0.5.7) upstream;
foo`; what's been built with `INTERIMAP_I=./lib INTERIMAP_PATH=./build
./tests/run foo`, and what's installed with `INTERIMAP_I=""
INTERIMAP_PATH=/usr/bin tests/run foo`.
+ * Split interimap and pullimap test suites.
+ Improve message for missing untagged UIDNEXT responses, which we
require but are omitted from some servers.
+ tests/tls-protocols: downgrade OpenSSL security level to 0, which is
diff --git a/Makefile b/Makefile
index 7bcda70..1d09ff2 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,20 @@ $(SERVICE_FILES): $(builddir)/%.service: $(srcdir)/%.service
@mkdir -vp $(dir $@)
sed "s|@bindir@|$(bindir)|" <"$<" >"$@"
-check: $(PROGRAMS)
+testcerts:
$(srcdir)/tests/certs/generate
- INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all
-installcheck:
- $(srcdir)/tests/certs/generate
- INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all
+check: check-interimap check-pullimap
+check-interimap: $(builddir)/interimap testcerts
+ INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all interimap.list
+check-pullimap: $(builddir)/pullimap testcerts
+ INTERIMAP_I=$(srcdir)/lib INTERIMAP_PATH=$(builddir) $(srcdir)/tests/run-all pullimap.list
+
+installcheck: installcheck-interimap installcheck-pullimap
+installcheck-interimap: testcerts
+ INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all interimap.list
+installcheck-pullimap: testcerts
+ INTERIMAP_I="" INTERIMAP_PATH=$(bindir) $(srcdir)/tests/run-all pullimap.list
release:
@if ! git -C $(srcdir) diff --quiet HEAD -- Changelog interimap pullimap lib/Net/IMAP/InterIMAP.pm; then \
@@ -103,4 +110,8 @@ clean:
rm -vf -- $(srcdir)/tests/certs/*.key $(srcdir)/tests/certs/*.crt $(srcdir)/tests/certs/*.pem
-rmdir -vp --ignore-fail-on-non-empty -- $(builddir)/doc
-.PHONY: all all-nodoc manual html doc check release install install-nodoc installcheck uninstall clean
+.PHONY: all all-nodoc manual html doc release testcerts \
+ check check-interimap check-pullimap \
+ install install-nodoc \
+ installcheck installcheck-interimap installcheck-pullimap \
+ uninstall clean
diff --git a/tests/list b/tests/interimap.list
index d1058ba..559daed 100644
--- a/tests/list
+++ b/tests/interimap.list
@@ -61,6 +61,3 @@ split-set Split large sets to avoid extra-long command lines
sync-live-crippled local/remote simulation (crippled remote)
sync-live-tls local/remote simulation (TLS remote)
sync-live-multi local/remote1+remote2+remote3 simulation (3 local namespaces)
-
-. pullimap
- ... pullimap
diff --git a/tests/pullimap.list b/tests/pullimap.list
new file mode 100644
index 0000000..f4304b9
--- /dev/null
+++ b/tests/pullimap.list
@@ -0,0 +1,2 @@
+. pullimap
+ ... pullimap
diff --git a/tests/run-all b/tests/run-all
index d13f689..79e62d1 100755
--- a/tests/run-all
+++ b/tests/run-all
@@ -24,6 +24,7 @@ export PATH
BASEDIR="$(dirname -- "$0")"
RUN="$BASEDIR/run"
+list="$1"
failed=0
@@ -54,7 +55,7 @@ while IFS="" read -r x; do
fi
INDENT="$indent" "$RUN" "$t" ${desc+"$desc"} || failed=$(( failed+1 ))
-done <"$BASEDIR/list"
+done <"$BASEDIR/$list"
if [ $failed -eq 0 ]; then
printf "All tests passed.\\n"