Maintenance.

Scripts/run-common.sh

@@ -38,13 +38,6 @@ run_player() {
     else
 	params="$port localhost $*"
     fi
-    if test $bin = Player-KeyGen.x -a ! -e Player-Data/Params-Data; then
-	./Setup.x $players $size 40
-    fi
-    if [[ $bin =~ Player- && ! $bin =~ Player-Online.x ]]; then
-	>&2 echo Running $SPDZROOT/Server.x $players $port
-	$SPDZROOT/Server.x $players $port &
-    fi
     rem=$(($players - 2))
     if test "$1"; then
 	log_prefix=$1-

Scripts/setup-replicated.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-HERE=$(cd `dirname $0`; pwd)
-SPDZROOT=$HERE/..
-
-# prime field bit length
-bits=${1:-128}
-
-$HERE/setup-ssl.sh 3
-
-$SPDZROOT/Setup.x 3 ${bits} 0 online

Scripts/test_tutorial.sh

@@ -28,11 +28,11 @@ function test_vm
     vm=$1
     shift
     if ! Scripts/$vm.sh tutorial $* | grep 'weighted average: 2.333'; then
-       for i in 0 1 2; do
-	   mv logs/tutorial-$i logs/tutorial-$i.bak
-       done
-       Scripts/$vm.sh tutorial $*
-       exit 1
+	for i in 0 1 2; do
+	    echo == Party $i
+	    cat logs/tutorial-$i
+	done
+	exit 1
     fi
 }
 
@@ -40,14 +40,16 @@ for dabit in ${dabit:-0 1 2}; do
     if [[ $dabit = 1 ]]; then
 	compile_opts="$compile_opts -X"
     elif [[ $dabit = 2 ]]; then
-	run_opts="$run_opts --fake-batch"
+	if [[ $cheap != 1 ]]; then
+	    run_opts="$run_opts --fake-batch"
+	fi
 	compile_opts="$compile_opts -Y"
     fi
 
     ./compile.py -R 64 $compile_opts tutorial
 
     for i in ring semi2k; do
-	test_vm $i
+	test_vm $i $run_opts
     done
 
     if ! test "$dabit" = 2 -a "$cheap" = 1; then

Scripts/yao.sh

@@ -2,11 +2,13 @@
 
 . Scripts/run-common.sh
 
+port=$[RANDOM+1024]
+
 for i in 0 1; do
     IFS=""
     log="yao-$*-$i"
     IFS=" "
-    $prefix ./yao-party.x -p $i $* 2>&1 | tee -a logs/$log & true
+    $prefix ./yao-party.x -p $i -pn $port $* 2>&1 | tee -a logs/$log & true
 done
 
 wait || exit 1