Browse Source

add tfb command and have travis source prereqs

Nate Brady 8 years ago
parent
commit
0b5b7ad70d
2 changed files with 7 additions and 12 deletions
  1. 5 0
      toolset/setup/linux/prerequisites.sh
  2. 2 12
      toolset/travis/travis_setup.sh

+ 5 - 0
toolset/setup/linux/prerequisites.sh

@@ -56,6 +56,11 @@ sudo sh -c "echo '*               -    nofile          65535' >> /etc/security/l
 sudo sh -c "echo '*            hard    rtprio             99' >> /etc/security/limits.conf"
 sudo sh -c "echo '*            hard    rtprio             99' >> /etc/security/limits.conf"
 sudo sh -c "echo '*            soft    rtprio             99' >> /etc/security/limits.conf"
 sudo sh -c "echo '*            soft    rtprio             99' >> /etc/security/limits.conf"
 
 
+# Create a tfb command alias for running the toolset
+# For now, this still ensures you have to be in the framework root to run it
+alias tfb="./toolset/run-tests.py"
+echo 'alias tfb="./toolset/run-tests.py"' >> ~/.bashrc
+
 # Sudo in case we don't have permissions on IROOT
 # Sudo in case we don't have permissions on IROOT
 sudo touch fwbm_prereqs_installed
 sudo touch fwbm_prereqs_installed
 
 

+ 2 - 12
toolset/travis/travis_setup.sh

@@ -2,18 +2,6 @@
 
 
 export DEBIAN_FRONTEND=noninteractive
 export DEBIAN_FRONTEND=noninteractive
 
 
-sudo apt-get update
-sudo apt-get install python-dev
-sudo pip install pyopenssl --upgrade
-sudo pip install ndg-httpsclient --upgrade
-sudo pip install pyasn1 --upgrade
-sudo pip install colorama
-# Version 2.3 has a nice Counter() and other features
-# but it requires —-allow-external and -—allow-unverified
-sudo pip install progressbar
-echo "127.0.0.1 " `hostname` | sudo tee /etc/hosts
-echo "127.0.0.1 localhost" | sudo tee /etc/hosts
-
 # Turn on command tracing
 # Turn on command tracing
 set -x
 set -x
 
 
@@ -36,3 +24,5 @@ echo "database_user=travis"                            >> benchmark.cfg
 echo "runner_user=travis"                              >> benchmark.cfg
 echo "runner_user=travis"                              >> benchmark.cfg
 
 
 echo "travis ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers
 echo "travis ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers
+
+source /home/travis/FrameworkBenchmarks/toolset/setup/linux/prerequisites.sh