projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/legacy-protocol.test: fix intermittent "Cannot read greeting from control socket"
[tinc]
/
test
/
scripts.test
diff --git
a/test/scripts.test
b/test/scripts.test
index
b2b37d2
..
7889e1d
100755
(executable)
--- a/
test/scripts.test
+++ b/
test/scripts.test
@@
-38,7
+38,7
@@
done
echo Starting server node...
echo Starting server node...
-$tinc
-n netname $c1
start $r1
+$tinc
$c1 -n netname
start $r1
echo foo-started >>$OUT
echo foo-started >>$OUT
@@
-46,13
+46,13
@@
echo foo-started >>$OUT
echo Inviting client node...
echo Inviting client node...
-url=`$tinc
-n netname2 $c1 invite bar | sed 's/\r//
'`
+url=`$tinc
$c1 -n netname2 invite bar | tr -d '\r
'`
file=`cd $d1/invitations; ls | grep -v ed25519_key.priv`
echo bar-invited >>$OUT
echo Joining client node...
file=`cd $d1/invitations; ls | grep -v ed25519_key.priv`
echo bar-invited >>$OUT
echo Joining client node...
-$tinc
-n netname3 $c2
join $url
+$tinc
$c2 -n netname3
join $url
echo bar-joined >>$OUT
# Start and stop client node
echo bar-joined >>$OUT
# Start and stop client node
@@
-126,5
+126,6
@@
subnet-down netname,foo,dummy,,foo,,,fec0::/64,,,,5
tinc-down netname,foo,dummy,,,,,,,,,5
EOF
tinc-down netname,foo,dummy,,,,,,,,,5
EOF
-sed -i 's/\r//' $OUT
-cmp $OUT $OUT.expected
+tr -d '\r' <$OUT >$OUT.actual
+
+cmp $OUT.actual $OUT.expected