8000 Updated test scripts · sumeetchhetri/ffead-cpp@78801ba · GitHub
[go: up one dir, main page]
Skip to content

Commit 78801ba

Browse files
sumeetchhetrisumeetchhetri
committed
Updated test scripts
1 parent d38ee77 commit 78801ba

11 files changed

+80
-28
lines changed

‎resources/techempower-config/ffead-cpp-framework.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
fw_installed ffead-cpp-framework && return 0
44

5+
#From https://github.com/TechEmpower/FrameworkBenchmarks/blob/master/frameworks/C%2B%2B/ulib/setup_json.sh
6+
if [ "$TRAVIS" != "true" ]; then
7+
MAX_THREADS=$(( 3 * $CPU_COUNT / 2 ))
8+
else
9+
MAX_THREADS=$(( 2 * $CPU_COUNT ))
10+
fi
11+
12+
WRIT_THREADS=$(( $MAX_THREADS / 3 ))
13+
SERV_THREADS=$(( $MAX_THREADS - $WRIT_THREADS ))
14+
515
fw_get -o ffead-cpp-src.zip https://github.com/sumeetchhetri/ffead-cpp/archive/master.zip
616
rm -rf ffead-cpp-src
717
rm -rf ffead-cpp-master
@@ -10,7 +20,11 @@ mv ffead-cpp-master ffead-cpp-src
1020
cd ffead-cpp-src/
1121
chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
1222
rm -rf web/te-benchmark
23+
cp -f ${TROOT}/server.sh script/
1324
cp -rf ${TROOT}/te-benchmark web/
25+
sed -i 's|THRD_PSIZ=6|THRD_PSIZ='${SERV_THREADS}'|g' resources/server.prop
26+
sed -i 's|W_THRD_PSIZ=2|W_THRD_PSIZ='${WRIT_THREADS}'|g' resources/server.prop
27+
sed -i 's|localhost|'${DBHOST}'|g' resources/server.prop
1428
./autogen.sh
1529
./configure --enable-apachemod=yes --enable-mod_sdormmongo=yes --enable-mod_sdormsql=yes CPPFLAGS="$CPPFLAGS -I${IROOT}/include/libmongoc-1.0 -I${IROOT}/include/libbson-1.0 -I${IROOT}/include/" LDFLAGS="$LDFLAGS -L${IROOT}"
1630
make install
@@ -29,4 +43,4 @@ cp resources/sample-odbc.ini ${IROOT}/odbc.ini
2943

3044
cd ${IROOT}
3145

32-
touch ${IROOT}/ffead-cpp-framework.installed
46+
touch ${IROOT}/ffead-cpp-framework.installed

‎resources/techempower-config/server.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/sh
2+
3+
export MALLOC_CHECK_=0
4+
IS_OS_DARWIN=`uname|tr '[A-Z]' '[a-z]'|awk 'index($0,"darwin") != 0 {print "darwin"}'`
5+
if [ "$IS_OS_DARWIN" != "" ]; then
6+
export FFEAD_CPP_PATH=`cd "$(dirname server.sh)" && ABSPATH=$(pwd) && cd -`
7+
else
8+
export FFEAD_CPP_PATH=`echo $(dirname $(readlink -f $0))`
9+
fi
10+
11+
echo $FFEAD_CPP_PATH
12+
export LD_LIBRARY_PATH=$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
13+
echo $LD_LIBRARY_PATH
14+
export PATH=$FFEAD_CPP_PATH/lib:$PATH
15+
echo $PATH
16+
export ODBCINI=$IROOT/odbc.ini
17+
export ODBCSYSINI=$IROOT
18+
echo $ODBCINI
19+
echo $ODBCSYSINI
20+
rm -f $FFEAD_CPP_PATH/rtdcf/*.d $FFEAD_CPP_PATH/rtdcf/*.o
21+
rm -f $FFEAD_CPP_PATH/*.cntrl
22+
rm -f $FFEAD_CPP_PATH/tmp/*.sess
23+
if [ ! -d tmp ]; then
24+
mkdir tmp
25+
fi
26+
chmod 700 $FFEAD_CPP_PATH/CHS*
27+
chmod 700 $FFEAD_CPP_PATH/resources/*.sh
28+
chmod 700 $FFEAD_CPP_PATH/tests/*
29+
chmod 700 $FFEAD_CPP_PATH/rtdcf/*
30+
#chmod 700 $FFEAD_CPP_PATH/rtdcf/autotools/*
31+
#/usr/sbin/setenforce 0
32+
./CHS $FFEAD_CPP_PATH > ffead.log 2>&1

‎resources/techempower-config/setup-apache-mongo.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
fw_depends ffead-cpp-apache-mongo
44

5-
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6-
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7-
echo $FFEAD_CPP_PATH
8-
echo $LD_LIBRARY_PATH
5+
#export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6+
#export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7+
#export ODBCINI=${IROOT}/odbc.ini
8+
#export ODBCSYSINI=${IROOT}
9+
#echo $FFEAD_CPP_PATH
10+
#echo $LD_LIBRARY_PATH
911
rm -f $FFEAD_CPP_PATH/*.cntrl
1012
rm -f $FFEAD_CPP_PATH/tmp/*.sess
1113
${IROOT}/httpd/bin/apachectl restart > ffead.log 2>&1

‎resources/techempower-config/setup-apache-mysql.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
fw_depends ffead-cpp-apache-mysql
44

5-
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6-
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7-
echo $FFEAD_CPP_PATH
8-
echo $LD_LIBRARY_PATH
5+
#export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6+
#export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7+
#export ODBCINI=${IROOT}/odbc.ini
8+
#export ODBCSYSINI=${IROOT}
9+
#echo $FFEAD_CPP_PATH
10+
#echo $LD_LIBRARY_PATH
911
rm -f $FFEAD_CPP_PATH/*.cntrl
1012
rm -f $FFEAD_CPP_PATH/tmp/*.sess
1113
${IROOT}/httpd/bin/apachectl restart > ffead.log 2>&1

‎resources/techempower-config/setup-apache-postgresql.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
fw_depends ffead-cpp-apache-postgresql
44

5-
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6-
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7-
echo $FFEAD_CPP_PATH
8-
echo $LD_LIBRARY_PATH
5+
#export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6+
#export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7+
#export ODBCINI=${IROOT}/odbc.ini
8+
#export ODBCSYSINI=${IROOT}
9+
#echo $FFEAD_CPP_PATH
10+
#echo $LD_LIBRARY_PATH
911
rm -f $FFEAD_CPP_PATH/*.cntrl
1012
rm -f $FFEAD_CPP_PATH/tmp/*.sess
1113
${IROOT}/httpd/bin/apachectl restart > ffead.log 2>&1

‎resources/techempower-config/setup-mongo.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
fw_depends ffead-cpp-emb-mongo
44

5-
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6-
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7-
echo $FFEAD_CPP_PATH
8-
echo $LD_LIBRARY_PATH
5+
chmod 755 $IROOT/ffead-cpp-2.0/*.sh
96
rm -f $FFEAD_CPP_PATH/*.cntrl
107
rm -f $FFEAD_CPP_PATH/tmp/*.sess
11-
$IROOT/ffead-cpp-2.0/CHS $FFEAD_CPP_PATH > ffead.log 2>&1
8+
cd $IROOT/ffead-cpp-2.0
9+
./server.sh

‎resources/techempower-config/setup-mysql.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
fw_depends ffead-cpp-emb-mysql
44

5-
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6-
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7-
echo $FFEAD_CPP_PATH
8-
echo $LD_LIBRARY_PATH
5+
chmod 755 $IROOT/ffead-cpp-2.0/*.sh
96
rm -f $FFEAD_CPP_PATH/*.cntrl
107
rm -f $FFEAD_CPP_PATH/tmp/*.sess
11-
$IROOT/ffead-cpp-2.0/CHS $FFEAD_CPP_PATH > ffead.log 2>&1
8+
cd $IROOT/ffead-cpp-2.0
9+
./server.sh

‎resources/techempower-config/setup-nginx-mongo.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ fw_depends ffead-cpp-nginx-mongo
44

55
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
66
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7+
export ODBCINI=${IROOT}/odbc.ini
8+
export ODBCSYSINI=${IROOT}
79
echo $FFEAD_CPP_PATH
810
echo $LD_LIBRARY_PATH
911
rm -f $FFEAD_CPP_PATH/*.cntrl

‎resources/techempower-config/setup-nginx-mysql.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ fw_depends ffead-cpp-nginx-mysql
44

55
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
66
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7+
export ODBCINI=${IROOT}/odbc.ini
8+
export ODBCSYSINI=${IROOT}
79
echo $FFEAD_CPP_PATH
810
echo $LD_LIBRARY_PATH
911
rm -f $FFEAD_CPP_PATH/*.cntrl

‎resources/techempower-config/setup-nginx-postgresql.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ fw_depends ffead-cpp-nginx-postgresql
44

55
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
66
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7+
export ODBCINI=${IROOT}/odbc.ini
8+
export ODBCSYSINI=${IROOT}
79
echo $FFEAD_CPP_PATH
810
echo $LD_LIBRARY_PATH
911
rm -f $FFEAD_CPP_PATH/*.cntrl

‎resources/techempower-config/setup-postgresql.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
fw_depends ffead-cpp-emb-postgresql
44

5-
export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
6-
export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
7-
echo $FFEAD_CPP_PATH
8-
echo $LD_LIBRARY_PATH
5+
chmod 755 $IROOT/ffead-cpp-2.0/*.sh
96
rm -f $FFEAD_CPP_PATH/*.cntrl
107
rm -f $FFEAD_CPP_PATH/tmp/*.sess
11-
$IROOT/ffead-cpp-2.0/CHS $FFEAD_CPP_PATH > ffead.log 2>&1
8+
cd $IROOT/ffead-cpp-2.0
9+
./server.sh

0 commit comments

Comments
 (0)
0