diff --git a/basice2e/clients.goldoutput/client12.out b/basice2e/clients.goldoutput/client12.out index a95df9f72862c0a82ac7c57f7305ffe9547fa77b..3889879f3a12b44a7502aec27b3159c8e2c0bb11 100755 --- a/basice2e/clients.goldoutput/client12.out +++ b/basice2e/clients.goldoutput/client12.out @@ -1,4 +1,4 @@ -Message from 31, #general Received: Channel, Hello -Message from 4, Rick Received: Hello, 1 Sending Message to 2, Jim: Hello, 2 +Message from 31, #general Received: Channel, Hello Sending Message to 2, Jim: Hello, 2 +Message from 4, Rick Received: Hello, 1 diff --git a/basice2e/clients.goldoutput/client23.out b/basice2e/clients.goldoutput/client23.out index 8ae4e7c7310a3b5f063a20f175256b8d16adde6e..661b1d207467f879d94e79e1e115085c7b0ca836 100755 --- a/basice2e/clients.goldoutput/client23.out +++ b/basice2e/clients.goldoutput/client23.out @@ -1,4 +1,4 @@ -Message from 1, David Received: Hello, 2 -Message from 31, #general Received: Channel, Hello Sending Message to 3, Ben: Hello, 3 +Message from 31, #general Received: Channel, Hello Sending Message to 3, Ben: Hello, 3 +Message from 1, David Received: Hello, 2 diff --git a/basice2e/clients.goldoutput/client34.out b/basice2e/clients.goldoutput/client34.out index be205e59a0fd872a7908e0292ee4c7e975d1a9f0..20cd0354a2a7417abf1ea78fd1b1cf16d5a4b1ff 100755 --- a/basice2e/clients.goldoutput/client34.out +++ b/basice2e/clients.goldoutput/client34.out @@ -1,4 +1,4 @@ -Message from 2, Jim Received: Hello, 3 -Message from 31, #general Received: Channel, Hello Sending Message to 4, Rick: Hello, 4 +Message from 31, #general Received: Channel, Hello Sending Message to 4, Rick: Hello, 4 +Message from 2, Jim Received: Hello, 3 diff --git a/basice2e/clients.goldoutput/client41.out b/basice2e/clients.goldoutput/client41.out index cbf2212c9d797ffaab457fd100dec618cecf1a83..0a3f6f179385e932bf4e545c71b2fd0caeaea7a1 100755 --- a/basice2e/clients.goldoutput/client41.out +++ b/basice2e/clients.goldoutput/client41.out @@ -1,4 +1,4 @@ -Message from 31, #general Received: Channel, Hello -Message from 3, Ben Received: Hello, 4 Sending Message to 1, David: Hello, 1 +Message from 31, #general Received: Channel, Hello Sending Message to 1, David: Hello, 1 +Message from 3, Ben Received: Hello, 4 diff --git a/basice2e/clients.goldoutput/client5.out b/basice2e/clients.goldoutput/client5.out index 77577046e0f6dc7f5722ef574495ed6c27a340a7..1f38da56d6f478828c4fd92757dba68958d15436 100644 --- a/basice2e/clients.goldoutput/client5.out +++ b/basice2e/clients.goldoutput/client5.out @@ -1,2 +1,2 @@ -Message from 31, #general Received: Channel, Hello Sending Message to 31, #general: Channel, Hello +Message from 31, #general Received: Channel, Hello diff --git a/basice2e/run.sh b/basice2e/run.sh index 2e89e2c6645eb531795b5f2d846c5156255351d0..5877f03207c3812a7ea17c9e5116e657bd94f5e5 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -93,15 +93,15 @@ runclients() { CHANNELCMD="../bin/client channelbot -v -i 31 --nick \"#general\" --numnodes 5 -s $LASTNODE -f blobchannel --noratchet" eval $CHANNELCMD >> $CHANNELOUT 2>&1 & PIDVAL=$! -echo "$CHANNELCMD -- $PIDVAL" echo $PIDVAL >> results/serverpids +echo "$CHANNELCMD -- $PIDVAL" # Start a dummy client DUMMYCMD="../bin/client -i 35 -d 35 -s $LASTNODE --numnodes 5 -m \"dummy\" --nick \"dummy\" --dummyfrequency 0.5 --noratchet -f blobdummy" eval $DUMMYCMD >> $DUMMYOUT 2>&1 & PIDVAL=$! -echo "$DUMMYCMD -- $PIDVAL" echo $PIDVAL >> results/serverpids +echo "$DUMMYCMD -- $PIDVAL" # Send a channel message that all clients will receive CLIENTCMD="timeout 60s ../bin/client -f blob5 --numnodes 5 -s $LASTNODE -i 5 -d 31 -m \"Channel, Hello\" --nick Spencer --noratchet" @@ -121,9 +121,7 @@ runclients for F in $(find results/clients -type f) do cat $F | grep -v "[Rr]atcheting" > $F.tmp - # Sort the messages, as we don't care if they arrive out of order - sort $F.tmp > $F - rm $F.tmp + mv $F.tmp $F done