From d6a2195668f68b919c15367290a8c9a12fdf1b78 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Thu, 6 Feb 2020 15:44:19 +0100 Subject: [PATCH] fix barrier again --- scripts/container/dcall-dup2-client | 2 +- scripts/container/dcall-dup2-server | 2 +- scripts/container/dcall-dup2-server-single | 2 +- scripts/container/dcall-lightning-client | 2 +- scripts/container/dcall-lightning-server | 2 +- scripts/container/dcall-lightning-server-single | 2 +- scripts/container/dcall-simple-client | 2 +- scripts/container/dcall-simple-server | 2 +- scripts/container/dcall-simple-server-single | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/container/dcall-dup2-client b/scripts/container/dcall-dup2-client index c4752c1..2ed2876 100755 --- a/scripts/container/dcall-dup2-client +++ b/scripts/container/dcall-dup2-client @@ -11,7 +11,7 @@ donar \ -r 5000 \ > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & -sync_barrier_donar 5001 5000 \ +tail -f $4/log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > $3/log/client-measboot-stdout.log 2> $3/log/client-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-dup2-server b/scripts/container/dcall-dup2-server index 7ec70a3..24a23cb 100755 --- a/scripts/container/dcall-dup2-server +++ b/scripts/container/dcall-dup2-server @@ -11,7 +11,7 @@ donar \ -r 5001 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -sync_barrier_donar 5000 5001 \ +tail -f ../log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-dup2-server-single b/scripts/container/dcall-dup2-server-single index f794631..c80dbef 100755 --- a/scripts/container/dcall-dup2-server-single +++ b/scripts/container/dcall-dup2-server-single @@ -12,7 +12,7 @@ donar \ -r 5001 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -sync_barrier_donar 5000 5001 \ +tail -f ../log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & dcall \ diff --git a/scripts/container/dcall-lightning-client b/scripts/container/dcall-lightning-client index 39c4cd5..ac860a7 100755 --- a/scripts/container/dcall-lightning-client +++ b/scripts/container/dcall-lightning-client @@ -12,7 +12,7 @@ donar \ -r 5000 \ > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log & -sync_barrier_donar 5001 5000 \ +tail -f $4/log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > $4/log/client-measboot-stdout.log 2> $4/log/client-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-lightning-server b/scripts/container/dcall-lightning-server index 8c1192a..44e3082 100755 --- a/scripts/container/dcall-lightning-server +++ b/scripts/container/dcall-lightning-server @@ -12,7 +12,7 @@ donar \ -r 5001 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -sync_barrier_donar 5000 5001 \ +tail -f ../log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-lightning-server-single b/scripts/container/dcall-lightning-server-single index 7550d51..da11586 100755 --- a/scripts/container/dcall-lightning-server-single +++ b/scripts/container/dcall-lightning-server-single @@ -13,7 +13,7 @@ donar \ -r 5001 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -sync_barrier_donar 5000 5001 \ +tail -f ../log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-simple-client b/scripts/container/dcall-simple-client index b406a6a..082a760 100755 --- a/scripts/container/dcall-simple-client +++ b/scripts/container/dcall-simple-client @@ -11,7 +11,7 @@ donar \ -r 5000 \ > $3/log/client-donar-stdout.log 2> $3/log/client-donar-stderr.log & -sync_barrier_donar 5001 5000 \ +tail -f $4/log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > $3/log/client-measboot-stdout.log 2> $3/log/client-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-simple-server b/scripts/container/dcall-simple-server index be1b37b..c399da0 100755 --- a/scripts/container/dcall-simple-server +++ b/scripts/container/dcall-simple-server @@ -11,7 +11,7 @@ donar \ -r 5001 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -sync_barrier_donar 5000 5001 \ +tail -f ../log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log dcall \ diff --git a/scripts/container/dcall-simple-server-single b/scripts/container/dcall-simple-server-single index 762578b..e78719d 100755 --- a/scripts/container/dcall-simple-server-single +++ b/scripts/container/dcall-simple-server-single @@ -11,7 +11,7 @@ donar \ -r 5001 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & -sync_barrier_donar 5000 5001 \ +tail -f ../log/server-donar-stdout.log | grep -q "=== Our 12 requested circuits are now up ===" \ > ../log/server-measboot-stdout.log 2> ../log/server-measboot-stderr.log & dcall \