Fix Travis build by disabling tests using IPv6

TravisCI has removed IPv6 support in 2016.  To cope with this regression
in the testing infrastructure, disable all tests on Travis that depend
on the system being able to handle ::1 as an IP address.  Normal unit
testing still uses the full test suite.
pull/13/head
Daniel Roethlisberger 8 years ago
parent d404063eab
commit 1c9aa249a9

@ -2,8 +2,7 @@ language: c
compiler:
- gcc
- clang
script: make && make test && ./sslsplit -V
script: make && make travis && ./sslsplit -V
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libssl-dev libevent-dev check
- sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'

@ -397,6 +397,9 @@ endif
%.o: %.c $(HDRS) GNUmakefile
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
travis: TCPPFLAGS+=-DTRAVIS
travis: test
test: TCPPFLAGS+=-D"TEST_ZEROUSR=\"$(shell id -u -n root||echo 0)\""
test: TCPPFLAGS+=-D"TEST_ZEROGRP=\"$(shell id -g -n root||echo 0)\""
test: $(TARGET).test

@ -385,7 +385,9 @@ opts_suite(void)
tc = tcase_create("proxyspec_parse");
tcase_add_test(tc, proxyspec_parse_01);
tcase_add_test(tc, proxyspec_parse_02);
#ifndef TRAVIS
tcase_add_test(tc, proxyspec_parse_02); /* IPv6 */
#endif /* TRAVIS */
tcase_add_exit_test(tc, proxyspec_parse_03, EXIT_FAILURE);
tcase_add_exit_test(tc, proxyspec_parse_04, EXIT_FAILURE);
tcase_add_test(tc, proxyspec_parse_05);
@ -396,8 +398,10 @@ opts_suite(void)
tcase_add_exit_test(tc, proxyspec_parse_10, EXIT_FAILURE);
tcase_add_test(tc, proxyspec_parse_11);
tcase_add_exit_test(tc, proxyspec_parse_12, EXIT_FAILURE);
tcase_add_test(tc, proxyspec_parse_13);
tcase_add_test(tc, proxyspec_parse_14);
#ifndef TRAVIS
tcase_add_test(tc, proxyspec_parse_13); /* IPv6 */
tcase_add_test(tc, proxyspec_parse_14); /* IPv6 */
#endif /* TRAVIS */
suite_add_tcase(s, tc);
tc = tcase_create("opts_debug");

Loading…
Cancel
Save