X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Ftestsuite%2FMakefile.ng;h=96d37f19a526885f20e1a29922a37c1a4f83b50b;hp=40076b46022044a4239b136cbbd0db074069173c;hb=HEAD;hpb=8e1beae4e7e57f5ef74fcc82532162a228e2e831

diff --git a/src/testsuite/Makefile.ng b/src/testsuite/Makefile.ng
index 40076b46..f866e608 100644
--- a/src/testsuite/Makefile.ng
+++ b/src/testsuite/Makefile.ng
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 
 __ng_Makefile_am_template__
 
-INCLUDES = -I$(srcdir)/../portab
+AM_CPPFLAGS = -I$(srcdir)/../portab
 
 EXTRA_DIST = \
 	Makefile.ng README functions.inc getpid.sh \
@@ -21,29 +21,46 @@ EXTRA_DIST = \
 	join-test.e kick-test.e message-test.e misc-test.e mode-test.e \
 	opless-channel-test.e server-link-test.e who-test.e whois-test.e \
 	stress-A.e stress-B.e \
+	server-login-test.e \
 	start-server1 stop-server1 ngircd-test1.conf \
-	start-server2 stop-server2 ngircd-test2.conf
+	start-server2 stop-server2 ngircd-test2.conf \
+	start-server3 stop-server3 ngircd-test3.conf \
+	reload-server3 reload-server.sh prep-server3 cleanup-server3 switch-server3 \
+	connect-ssl-cert1-test.e connect-ssl-cert2-test.e \
+	ssl/cert-my-first-domain-tld.pem ssl/cert-my-second-domain-tld.pem \
+	ssl/dhparams-my-first-domain-tld.pem ssl/dhparams-my-second-domain-tld.pem \
+	ssl/key-my-first-domain-tld.pem ssl/key-my-second-domain-tld.pem
 
 all:
 
 clean-local:
-	rm -rf logs tests *-test ngircd-test*.log procs.tmp \
-	 T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd
+	rm -rf logs tests *-test ngircd-test*.log procs.tmp tests-skipped.lst \
+	 T-ngircd1 ngircd-test1.motd T-ngircd2 ngircd-test2.motd T-ngircd3 ngircd-test3.motd
 
 maintainer-clean-local:
-	rm -f Makefile Makefile.in
+	rm -f Makefile Makefile.in Makefile.am
 
 check_SCRIPTS = ngircd-TEST-Binary tests.sh
 
 ngircd-TEST-Binary:
 	cp ../ngircd/ngircd T-ngircd1
 	cp ../ngircd/ngircd T-ngircd2
+	cp ../ngircd/ngircd T-ngircd3
 	[ -f getpid.sh ] || ln -s $(srcdir)/getpid.sh .
+	rm -f tests-skipped.lst
 
 connect-test: tests.sh
 	rm -f connect-test
 	ln -s $(srcdir)/tests.sh connect-test
 
+connect-ssl-cert1-test: tests.sh
+	rm -f connect-ssl-cert1-test
+	ln -s $(srcdir)/tests.sh connect-ssl-cert1-test
+
+connect-ssl-cert2-test: tests.sh
+	rm -f connect-ssl-cert2-test
+	ln -s $(srcdir)/tests.sh connect-ssl-cert2-test
+
 channel-test: tests.sh
 	rm -f channel-test
 	ln -s $(srcdir)/tests.sh channel-test
@@ -80,6 +97,10 @@ server-link-test: tests.sh
 	rm -f server-link-test
 	ln -s $(srcdir)/tests.sh server-link-test
 
+server-login-test: tests.sh
+	rm -f server-login-test
+	ln -s $(srcdir)/tests.sh server-login-test
+
 who-test: tests.sh
 	rm -f who-test
 	ln -s $(srcdir)/tests.sh who-test
@@ -102,8 +123,21 @@ TESTS = start-server1 \
 	who-test \
 	whois-test \
 	server-link-test \
+	server-login-test \
 	stop-server2 \
 	stress-server.sh \
 	stop-server1
 
+if HAVE_SSL
+TESTS += \
+	prep-server3 \
+	start-server3 \
+	connect-ssl-cert1-test \
+	switch-server3 \
+	reload-server3 \
+	connect-ssl-cert2-test \
+	cleanup-server3 \
+	stop-server3
+endif
+
 # -eof-