allura
| Révision | f6375a7b3891b45c2c8e445bbc1f8a838b6228c2 (tree) |
|---|---|
| l'heure | 2011-04-29 01:02:28 |
| Auteur | Dave Brondsema <dbrondsema@geek...> |
| Commiter | Dave Brondsema |
remove unused solr bootstrap from run_tests
Signed-off-by: Dave Brondsema <dbrondsema@geek.net>
| @@ -1,25 +1,9 @@ | ||
| 1 | 1 | #!/bin/bash |
| 2 | 2 | |
| 3 | -function check_port() { | |
| 4 | - PORT=$1 | |
| 5 | - echo ' quit' |telnet localhost $PORT >/dev/null 2>&1 | |
| 6 | -} | |
| 7 | - | |
| 8 | -if [ -z "$VIRTUAL_ENV" ]; then | |
| 9 | - source /var/local/env-allura/bin/activate | |
| 10 | -fi | |
| 11 | - | |
| 12 | -# If this is sandbox and local SOLR isn't running, start it | |
| 13 | 3 | if [ -n "$SF_SYSTEM_FUNC" ]; then |
| 14 | - if ! check_port 50065; then | |
| 15 | - SOLRCONFIG="/var/local/allura/solr_config" | |
| 16 | - SOLRLOG=/usr/local/solr/logs/console.log | |
| 17 | - echo "Starting SOLR, log is at $SOLRLOG" | |
| 18 | - pushd /usr/local/solr | |
| 19 | - /usr/java/jdk1.5.0_15/bin/java -Dsolr.solr.home="$SOLRCONFIG" -jar start.jar >$SOLRLOG 2>&1 & | |
| 20 | - popd | |
| 21 | - sleep 15 | |
| 22 | - fi | |
| 4 | + if [ -z "$VIRTUAL_ENV" ]; then | |
| 5 | + source /var/local/env-allura/bin/activate | |
| 6 | + fi | |
| 23 | 7 | fi |
| 24 | 8 | |
| 25 | 9 | # main |
sado
Fork
allura
run_tests