Merge branch 'master' of gitlab.inria.fr:qdufour/donar

This commit is contained in:
Quentin 2019-09-17 15:36:17 +02:00
commit b969ae7077
2 changed files with 58 additions and 2 deletions

View file

@ -230,7 +230,7 @@ thunder_configure_full_parse:
thunder_configure_2_full:
./run-3 \
12,thunder_configure_2. \
2,thunder_configure_2. \
thunder-client 9900 30 100 2 50, \
thunder-client 9900 30 100 2 150, \
thunder-client 9900 30 100 2 250, \
@ -252,6 +252,20 @@ thunder_configure_2_full:
thunder-client 9900 30 100 6 450, \
thunder-client 9900 30 100 6 550, \
thunder-client 9900 30 100 6 650, \
thunder-client 9900 30 100 12 50, \
thunder-client 9900 30 100 12 150, \
thunder-client 9900 30 100 12 250, \
thunder-client 9900 30 100 12 350, \
thunder-client 9900 30 100 12 450, \
thunder-client 9900 30 100 12 550, \
thunder-client 9900 30 100 12 650, \
thunder-client 9900 30 100 16 50, \
thunder-client 9900 30 100 16 150, \
thunder-client 9900 30 100 16 250, \
thunder-client 9900 30 100 16 350, \
thunder-client 9900 30 100 16 450, \
thunder-client 9900 30 100 16 550, \
thunder-client 9900 30 100 16 650, \
thunder-client 9900 30 100 8 50, \
thunder-client 9900 30 100 8 150, \
thunder-client 9900 30 100 8 250, \
@ -280,6 +294,20 @@ thunder_configure_2_full:
thunder-server 6 450, \
thunder-server 6 550, \
thunder-server 6 650, \
thunder-server 16 50, \
thunder-server 16 150, \
thunder-server 16 250, \
thunder-server 16 350, \
thunder-server 16 450, \
thunder-server 16 550, \
thunder-server 16 650, \
thunder-server 12 50, \
thunder-server 12 150, \
thunder-server 12 250, \
thunder-server 12 350, \
thunder-server 12 450, \
thunder-server 12 550, \
thunder-server 12 650, \
thunder-server 8 50, \
thunder-server 8 150, \
thunder-server 8 250, \
@ -314,6 +342,20 @@ thunder_configure_2_full:
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple. \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
@ -342,6 +384,20 @@ thunder_configure_2_full:
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple, \
tor2 -f /etc/torrc_simple
thunder_configure_2_full_parse:

View file

@ -5,7 +5,7 @@
die() { echo "$*" 1>&2 ; exit 1; }
WAITFOR=900 # 15min
WAITFOR=1200 # 15min
# SPLIT CLIENT AND SERVER TARGETS
OLD_IFS=$IFS; IFS="."