summaryrefslogtreecommitdiff
path: root/docker-test/throughput_httpd_2.4.16
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2015-11-12 16:57:45 -0800
committerJoseph Henry <josephjah@gmail.com>2015-11-12 16:57:45 -0800
commita818c622d9fa28da47f70d9afb5e4ecf0cafaf04 (patch)
tree401fc6773799cf94dcce3dcdab8faa4dbf6fa3f6 /docker-test/throughput_httpd_2.4.16
parent7d8084262acad594da089db58eb41dea73f661ca (diff)
downloadinfinitytier-a818c622d9fa28da47f70d9afb5e4ecf0cafaf04.tar.gz
infinitytier-a818c622d9fa28da47f70d9afb5e4ecf0cafaf04.zip
Updated throughput_httpd docker test files
Diffstat (limited to 'docker-test/throughput_httpd_2.4.16')
-rwxr-xr-xdocker-test/throughput_httpd_2.4.16/build.sh4
-rwxr-xr-xdocker-test/throughput_httpd_2.4.16/intercept54
2 files changed, 2 insertions, 56 deletions
diff --git a/docker-test/throughput_httpd_2.4.16/build.sh b/docker-test/throughput_httpd_2.4.16/build.sh
index 1e31ab22..2925035a 100755
--- a/docker-test/throughput_httpd_2.4.16/build.sh
+++ b/docker-test/throughput_httpd_2.4.16/build.sh
@@ -7,11 +7,11 @@ rm *.o
rm liblwip.so
make -f make-liblwip.mk
-cd ../docker-test/throughput
+cd ../docker-test/throughput_httpd_2.4.16
cp ../../zerotier-one zerotier-one
cp ../../zerotier-cli zerotier-cli
cp ../../netcon/liblwip.so liblwip.so
cp ../../netcon/libintercept.so.1.0 libintercept.so.1.0
-
+cp ../../netcon/intercept intercept
diff --git a/docker-test/throughput_httpd_2.4.16/intercept b/docker-test/throughput_httpd_2.4.16/intercept
deleted file mode 100755
index 3eb27ff7..00000000
--- a/docker-test/throughput_httpd_2.4.16/intercept
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-# usage:
-# /usr/bin/intercept program <args>
-
-if [ $# = 0 ] ; then
- echo "$0: insufficient arguments"
- exit
-fi
-
-case "$1" in
- on)
- if [ -z "$LD_PRELOAD" ]
- then
- export LD_PRELOAD="/lib/libintercept.so.1.0"
- else
- echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
- export LD_PRELOAD="/lib/libintercept.so $LD_PRELOAD"
- fi
- ;;
- off)
- export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libintercept.so.1.0 \?//'`
- if [ -z "$LD_PRELOAD" ]
- then
- unset LD_PRELOAD
- fi
- ;;
- show|sh)
- echo "LD_PRELOAD=\"$LD_PRELOAD\""
- ;;
- -h|-?)
- echo ""
- ;;
- *)
- if [ -z "$LD_PRELOAD" ]
- then
- export LD_PRELOAD="/lib/libintercept.so.1.0"
- else
- echo $LD_PRELOAD | grep -q "/lib/libintercept\.so.1.0" || \
- export LD_PRELOAD="/lib/libintercept.so.1.0 $LD_PRELOAD"
- fi
-
- if [ $# = 0 ]
- then
- ${SHELL:-/bin/sh}
- fi
-
- if [ $# -gt 0 ]
- then
- exec "$@"
- fi
- ;;
-esac
-
-#EOF