stefanocasazza 9 years ago
parent
commit
d0d85b95ef

+ 5 - 0
frameworks/C++/ulib/setup_json.sh

@@ -2,7 +2,12 @@
 
 
 fw_depends ulib
 fw_depends ulib
 
 
+# Travis is broken
+if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
+else
+MAX_THREADS=$(( 2 * $MAX_THREADS ))
+fi
 
 
 # 1. Change ULib Server (userver_tcp) configuration
 # 1. Change ULib Server (userver_tcp) configuration
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg

+ 5 - 0
frameworks/C++/ulib/setup_mongodb.sh

@@ -2,7 +2,12 @@
 
 
 fw_depends ulib
 fw_depends ulib
 
 
+# Travis is broken
+if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
+else
+MAX_THREADS=$(( 2 * $MAX_THREADS ))
+fi
 
 
 # 1. Change ULib Server (userver_tcp) configuration
 # 1. Change ULib Server (userver_tcp) configuration
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg

+ 5 - 0
frameworks/C++/ulib/setup_mysql.sh

@@ -2,7 +2,12 @@
 
 
 fw_depends ulib
 fw_depends ulib
 
 
+# Travis is broken
+if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
+else
+MAX_THREADS=$(( 2 * $MAX_THREADS ))
+fi
 
 
 # 1. Change ULib Server (userver_tcp) configuration
 # 1. Change ULib Server (userver_tcp) configuration
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET -2|g"								  $IROOT/ULib/benchmark.cfg
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET -2|g"								  $IROOT/ULib/benchmark.cfg

+ 1 - 1
frameworks/C++/ulib/setup_plaintext.sh

@@ -2,7 +2,7 @@
 
 
 fw_depends ulib
 fw_depends ulib
 
 
-# Check if travis is broken
+# Travis is broken
 if [ "$TRAVIS" != "true" ]; then
 if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 else
 else

+ 5 - 0
frameworks/C++/ulib/setup_redis.sh

@@ -2,7 +2,12 @@
 
 
 fw_depends ulib
 fw_depends ulib
 
 
+# Travis is broken
+if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
+else
+MAX_THREADS=$(( 2 * $MAX_THREADS ))
+fi
 
 
 # 1. Change ULib Server (userver_tcp) configuration
 # 1. Change ULib Server (userver_tcp) configuration
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg

+ 5 - 0
frameworks/C++/ulib/setup_sqlite.sh

@@ -2,7 +2,12 @@
 
 
 fw_depends ulib
 fw_depends ulib
 
 
+# Travis is broken
+if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
 MAX_THREADS=$(( 3 * $MAX_THREADS / 2 ))
+else
+MAX_THREADS=$(( 2 * $MAX_THREADS ))
+fi
 
 
 # 1. Change ULib Server (userver_tcp) configuration
 # 1. Change ULib Server (userver_tcp) configuration
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg
 sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g"									  $IROOT/ULib/benchmark.cfg