Browse Source

Trigger travis build for new FW ULib. Minor changes to ULib

Hamilton Turner 11 years ago
parent
commit
3d6575056a
2 changed files with 1 additions and 18 deletions
  1. 1 0
      .travis.yml
  2. 0 18
      ULib/install.sh

+ 1 - 0
.travis.yml

@@ -135,6 +135,7 @@ env:
     - TESTDIR=tapestry
     - TESTDIR=tornado
     - TESTDIR=treefrog
+    - TESTDIR=ULib
     - TESTDIR=undertow
     - TESTDIR=undertow-edge
     - TESTDIR=unfiltered

+ 0 - 18
ULib/install.sh

@@ -14,7 +14,6 @@
 #    . $FWROOT/toolset/setup/linux/bash_functions.sh && 
 #    . $FWROOT/ULib/install.sh (cwd=$FWROOT//installs)
 # --------------------------------------------------------------------------------------------------------
-. ${TROOT}/bash_profile.sh
 
 if [ ! -d "$ULIB_ROOT" ]; then
   mkdir -p $ULIB_ROOT
@@ -22,23 +21,6 @@ fi
 
 cd $ULIB_ROOT
 
-if [ ! -f "benchmark.cfg" ]; then
-  cat <<EOF >benchmark.cfg
-userver {
- PORT 8080
- PREFORK_CHILD 8
- LISTEN_BACKLOG 8192
- MAX_KEEP_ALIVE 8192
- DOCUMENT_ROOT $ULIB_DOCUMENT_ROOT
- PID_FILE ${ULIB_ROOT}/userver_tcp.pid
-}
-EOF
-fi
-
-if [ -x "bin/userver_tcp" ] && [ -x "${ULIB_DOCUMENT_ROOT}/db.so" ]; then
-  exit 0
-fi
-
 # 1. Download ULib
 if [ ! -f "v${ULIB_VERSION}.tar.gz" ]; then
 	wget -nc --no-check-certificate --trust-server-names -O v${ULIB_VERSION}.tar.gz \