[Git][debian-proftpd-team/proftpd][master] 2 commits: Enable upstreams test suite (partially).

[Hilmar Preuße (@hilmar-guest)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
051adc01 by Hilmar Preusse at 2023-03-13T23:50:31+01:00
Enable upstreams test suite (partially).

- - - - -
f239ce18 by Hilmar Preuße at 2023-03-14T09:06:28+00:00
Merge branch 'enable_test_suite' into 'master'

Enable upstreams test suite (partially).

See merge request debian-proftpd-team/proftpd!10
- - - - -


6 changed files:

- + debian/patches/01_disable_inet_connect_ipv4_test.diff
- + debian/patches/02_disable_redis_sentinel_conn_new_test.diff
- + debian/patches/03_disable_all_non_api_tests.diff
- debian/patches/series
- + debian/tests/control
- + debian/tests/test-suite


Changes:

=====================================
debian/patches/01_disable_inet_connect_ipv4_test.diff
=====================================
@@ -0,0 +1,11 @@
+--- proftpd.orig/tests/api/inet.c
++++ proftpd/tests/api/inet.c
+@@ -1171,7 +1171,7 @@
+   tcase_add_test(testcase, inet_set_socket_opts_test);
+   tcase_add_test(testcase, inet_set_socket_opts2_test);
+   tcase_add_test(testcase, inet_listen_test);
+-  tcase_add_test(testcase, inet_connect_ipv4_test);
++  /* tcase_add_test(testcase, inet_connect_ipv4_test); */
+   tcase_add_test(testcase, inet_connect_ipv6_test);
+   tcase_add_test(testcase, inet_connect_nowait_test);
+   tcase_add_test(testcase, inet_accept_test);


=====================================
debian/patches/02_disable_redis_sentinel_conn_new_test.diff
=====================================
@@ -0,0 +1,11 @@
+--- proftpd.orig/tests/api/redis.c
++++ proftpd/tests/api/redis.c
+@@ -4917,7 +4917,7 @@
+ 
+   tcase_add_test(testcase, redis_sentinel_get_master_addr_test);
+   tcase_add_test(testcase, redis_sentinel_get_masters_test);
+-  tcase_add_test(testcase, redis_sentinel_conn_new_test);
++  /* tcase_add_test(testcase, redis_sentinel_conn_new_test); */
+ 
+   tcase_add_test(testcase, redis_remove_test);
+   tcase_add_test(testcase, redis_add_test);


=====================================
debian/patches/03_disable_all_non_api_tests.diff
=====================================
@@ -0,0 +1,11 @@
+--- proftpd.orig/tests/Makefile.in
++++ proftpd/tests/Makefile.in
+@@ -145,7 +145,7 @@
+ check-utils:
+ 	perl tests.pl --file-pattern '^t\/utils\/'
+ 
+-check: check-api running-tests
++check: check-api
+ 
+ clean:
+ 	$(LIBTOOL) --mode=clean $(RM) *.o *.gcda *.gcno api/*.o api/*.gcda api/*.gcno api-tests$(EXEEXT) api-tests.log


=====================================
debian/patches/series
=====================================
@@ -14,3 +14,6 @@ upstream_bug_1581.diff
 upstream_bug_1584.diff
 upstream_1592.diff
 upstream_bug_1597.diff
+01_disable_inet_connect_ipv4_test.diff
+02_disable_redis_sentinel_conn_new_test.diff
+03_disable_all_non_api_tests.diff


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,10 @@
+Tests: test-suite
+Depends: @builddeps@,
+	check,
+	libtest-unit-perl,
+	libnet-address-ip-local-perl,
+	libnet-inet6glue-perl,
+	libnet-telnet-perl,
+	libhttp-message-perl,
+	redis-server
+Restrictions: allow-stderr


=====================================
debian/tests/test-suite
=====================================
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+DSOMODS1=mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq
+DSOMODS2=mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file
+DSOMODS3=mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion
+DSOMODS4=mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession:mod_auth_otp:mod_tls_redis
+DSOMODS5=mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme:mod_snmp:mod_digest:mod_ident
+DSOMODS6=mod_log_forensic:mod_qos:mod_statcache:mod_tls_fscache:mod_tls_shmcache:mod_dnsbl
+
+./configure --disable-option-checking --disable-silent-rules --disable-dependency-tracking \
+	    --prefix=/usr --with-pkgconfig=lib/pkgconfig LIBS="-lm -lrt -pthread -lsubunit" \
+	    --with-includes=$(pg_config --includedir)$(mysql_config --include|sed -e 's/-I/:/g'|sed -e 's/ //') \
+	    --mandir=/usr/share/man --localstatedir=/run --libexecdir=/usr/lib/proftpd \
+	    --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls --enable-openssl \
+	    --enable-ipv6 --enable-nls --enable-memcache --enable-pcre2 \
+	    --disable-strip --enable-redis --enable-tests \
+	    --with-shared=${DSOMODS1}:${DSOMODS2}:${DSOMODS3}:${DSOMODS4}:${DSOMODS5}:${DSOMODS6}
+
+make check



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/49065995cb14cfc3ae74f96f56177a893834325e...f239ce18649adb2963c38972eb9b601f7fbd12a5

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/49065995cb14cfc3ae74f96f56177a893834325e...f239ce18649adb2963c38972eb9b601f7fbd12a5
You're receiving this email because of your account on salsa.debian.org.