From 82a60b1e288773b18fb98eb7898c4bfc87587679 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Mon, 9 Nov 2015 20:16:27 -0800 Subject: Fixed throughput build script --- docker-test/throughput/build.sh | 3 ++- docker-test/throughput/generate_file.sh | 2 +- docker-test/throughput/zerotier-cli | Bin 741168 -> 737072 bytes docker-test/throughput/zerotier-one | Bin 741168 -> 737072 bytes netcon/libintercept.so.1.0 | Bin 56832 -> 0 bytes netcon/liblwip.so | Bin 333696 -> 0 bytes 6 files changed, 3 insertions(+), 2 deletions(-) delete mode 100755 netcon/libintercept.so.1.0 delete mode 100755 netcon/liblwip.so diff --git a/docker-test/throughput/build.sh b/docker-test/throughput/build.sh index 586c8931..1e31ab22 100755 --- a/docker-test/throughput/build.sh +++ b/docker-test/throughput/build.sh @@ -6,7 +6,8 @@ make -f make-intercept.mk lib rm *.o rm liblwip.so make -f make-liblwip.mk -cd ../docker-test/throughput-test + +cd ../docker-test/throughput cp ../../zerotier-one zerotier-one cp ../../zerotier-cli zerotier-cli diff --git a/docker-test/throughput/generate_file.sh b/docker-test/throughput/generate_file.sh index fd84de32..ac5b2433 100644 --- a/docker-test/throughput/generate_file.sh +++ b/docker-test/throughput/generate_file.sh @@ -1 +1 @@ -dd if=/dev/urandom of=/var/www/html/bigfile bs=100M count=1 +dd if=/dev/urandom of=/var/www/html/big bs=100M count=1 diff --git a/docker-test/throughput/zerotier-cli b/docker-test/throughput/zerotier-cli index 020ee665..6e659e7a 100755 Binary files a/docker-test/throughput/zerotier-cli and b/docker-test/throughput/zerotier-cli differ diff --git a/docker-test/throughput/zerotier-one b/docker-test/throughput/zerotier-one index 020ee665..6e659e7a 100755 Binary files a/docker-test/throughput/zerotier-one and b/docker-test/throughput/zerotier-one differ diff --git a/netcon/libintercept.so.1.0 b/netcon/libintercept.so.1.0 deleted file mode 100755 index 7a451408..00000000 Binary files a/netcon/libintercept.so.1.0 and /dev/null differ diff --git a/netcon/liblwip.so b/netcon/liblwip.so deleted file mode 100755 index 158169f1..00000000 Binary files a/netcon/liblwip.so and /dev/null differ -- cgit v1.2.3