Knocked out Dart, Erlang, and Go tests

frameworks/Dart/dart-redstone/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends dart

frameworks/Dart/dart-redstone/setup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-export DART_HOME=$IROOT/dart-sdk
-export PUB_CACHE=$IROOT/.pubcache
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml
 
-$DART_HOME/bin/pub upgrade
+fw_depends dart
 
-$DART_HOME/bin/dart server.dart -a 0.0.0.0 -p 8080 -d ${MAX_THREADS} -i ${MAX_THREADS} &
+pub upgrade
+
+dart server.dart -a 0.0.0.0 -p 8080 -d ${MAX_THREADS} -i ${MAX_THREADS} &

frameworks/Dart/dart-start/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends dart nginx

frameworks/Dart/dart-start/setup.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
-export DART_HOME=$IROOT/dart-sdk
-export PUB_CACHE=$IROOT/.pubcache
-export NGINX_HOME=$IROOT/nginx
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml
 
-$DART_HOME/bin/pub upgrade
+fw_depends dart nginx
+
+pub upgrade
 
 #
 # start dart servers
@@ -14,7 +13,7 @@ $DART_HOME/bin/pub upgrade
 current=9001
 end=$(($current+$MAX_THREADS))
 while [ $current -lt $end ]; do
-  $DART_HOME/bin/dart server.dart -a 127.0.0.1 -p $current -d ${MAX_THREADS} &
+  dart server.dart -a 127.0.0.1 -p $current -d ${MAX_THREADS} &
   let current=current+1
 done
 
@@ -55,4 +54,4 @@ conf+="}"
 #
 echo -e $conf > nginx.conf
 
-$NGINX_HOME/sbin/nginx -c $(pwd)/nginx.conf &
+nginx -c $(pwd)/nginx.conf &

frameworks/Dart/dart-stream/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends dart nginx

frameworks/Dart/dart-stream/setup.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
-export DART_HOME=$IROOT/dart-sdk
-export PUB_CACHE=$IROOT/.pubcache
-export NGINX_HOME=$IROOT/nginx
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' mongodb.yaml
 
-$DART_HOME/bin/pub upgrade
+fw_depends dart nginx
+
+pub upgrade
 
 #
 # start dart servers
@@ -14,7 +13,7 @@ $DART_HOME/bin/pub upgrade
 current=9001
 end=$(($current+$MAX_THREADS))
 while [ $current -lt $end ]; do
-  $DART_HOME/bin/dart server.dart -a 127.0.0.1 -p $current -d ${MAX_THREADS} &
+  dart server.dart -a 127.0.0.1 -p $current -d ${MAX_THREADS} &
   let current=current+1
 done
 
@@ -55,4 +54,4 @@ conf+="}"
 #
 echo -e $conf > nginx.conf
 
-$NGINX_HOME/sbin/nginx -c $(pwd)/nginx.conf &
+nginx -c $(pwd)/nginx.conf &

frameworks/Dart/dart/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends dart

frameworks/Dart/dart/setup.sh

@@ -2,10 +2,8 @@
 
 sed -i 's|host: .*|host: '"${DBHOST}"'|g' postgresql.yaml
 
-export DART_HOME=$IROOT/dart-sdk
+fw_depends dart
 
-export PUB_CACHE=$IROOT/.pubcache
+pub upgrade
 
-$DART_HOME/bin/pub upgrade
-
-$DART_HOME/bin/dart server.dart -a 0.0.0.0 -p 8080 -d ${MAX_THREADS} -i ${MAX_THREADS} &
+dart server.dart -a 0.0.0.0 -p 8080 -d ${MAX_THREADS} -i ${MAX_THREADS} &

frameworks/Erlang/cowboy/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends erlang rebar

frameworks/Erlang/cowboy/setup_erlang.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
-export REBAR_HOME=$IROOT/rebar
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/hello_world_app.erl
 
+fw_depends erlang rebar
+
 rm -rf deps/*
-$REBAR_HOME/rebar get-deps
-$REBAR_HOME/rebar compile
+rebar get-deps
+rebar compile
 erl -pa ebin deps/*/ebin +sbwt very_long +swt very_low -s hello_world -noshell -detached

frameworks/Erlang/elli/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends erlang rebar

frameworks/Erlang/elli/setup_erlang.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
-export REBAR_HOME=$IROOT/rebar
 
 sed -i 's|"benchmarkdbpass", ".*", 3306|"benchmarkdbpass", "'"${DBHOST}"'", 3306|g' src/elli_bench_sup.erl
 
+fw_depends erlang rebar
+
 rm -rf deps/*
-$REBAR_HOME/rebar get-deps
-$REBAR_HOME/rebar compile
-erl -pa ebin deps/*/ebin +sbwt very_long +swt very_low -s elli_bench -noshell -detached
+rebar get-deps
+rebar compile
+erl -pa ebin deps/*/ebin +sbwt very_long +swt very_low -s elli_bench -noshell -detached

frameworks/Go/beego/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/beego/setup.sh

@@ -1,15 +1,12 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
 
+export GOPATH=${TROOT}
 
 go get github.com/astaxie/beego
 go get github.com/go-sql-driver/mysql
 
-go run src/hello/hello.go &
+go run src/hello/hello.go &

frameworks/Go/falcore/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/falcore/setup.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/framework_benchmarks/falcore.go
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+
+export GOPATH=${TROOT}
 
 go get ./...
-go run src/framework_benchmarks/falcore.go &
+go run src/framework_benchmarks/falcore.go &

frameworks/Go/gin/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/gin/setup.sh

@@ -1,12 +1,9 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get github.com/gin-gonic/gin
 go get github.com/go-sql-driver/mysql
 
-go run hello.go &
+go run hello.go &

frameworks/Go/go-mongodb/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/go-mongodb/setup.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
 
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
+sed -i 's|connectionString = "localhost"|connectionString = "'"${DBHOST}"'"|g' src/hello/hello.go
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get ./...
 
-go run src/hello/hello.go &
+go run src/hello/hello.go &

frameworks/Go/go/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/go/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get ./...
 
-go run src/hello/hello.go &
+go run src/hello/hello.go &

frameworks/Go/go/setup_prefork.sh

@@ -1,13 +1,9 @@
 #!/bin/bash
 
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
-
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/hello/hello.go
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get ./...
 

frameworks/Go/goji/install.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-
-fw_depends go
-
-export GOROOT=${IROOT}/go
-
-export GOPATH=${TROOT}
-
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
-
-go get github.com/go-sql-driver/mysql
-go get github.com/zenazn/goji
-go get github.com/zenazn/goji/web

frameworks/Go/goji/setup.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
-export GOROOT=${IROOT}/go
+sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/goji/server.go
+
+fw_depends go
 
 export GOPATH=${TROOT}
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+go get github.com/go-sql-driver/mysql
+go get github.com/zenazn/goji
+go get github.com/zenazn/goji/web
 
 go run src/goji/server.go &

frameworks/Go/revel-jet/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/revel-jet/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 
-# here te find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get -u github.com/robfig/revel/revel github.com/eaigner/jet
 go build -o bin/revel github.com/robfig/revel/revel
-bin/revel run benchmark prod &
+bin/revel run benchmark prod &

frameworks/Go/revel-qbs/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/revel-qbs/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get -u github.com/robfig/revel/revel github.com/coocood/qbs
 go build -o bin/revel github.com/robfig/revel/revel
-bin/revel run benchmark prod &
+bin/revel run benchmark prod &

frameworks/Go/revel/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/revel/setup.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
+
+fw_depends go
 export GOPATH=${TROOT}
 
 sed -i 's|tcp(.*:3306)|tcp('"${DBHOST}"':3306)|g' src/benchmark/conf/app.conf
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
-
 go get -u github.com/robfig/revel/revel
 go build -o bin/revel github.com/robfig/revel/revel
-bin/revel run benchmark prod &
+bin/revel run benchmark prod &

frameworks/Go/webgo/install.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-fw_depends go

frameworks/Go/webgo/setup.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
-# Set the root of our go installation
-export GOROOT=${IROOT}/go
-export GOPATH=${TROOT}
 
-# Where to find the go executable
-export PATH="$GOROOT/bin:$PATH"
+fw_depends go
+export GOPATH=${TROOT}
 
 go get github.com/hoisie/web
 
-go run src/hello/hello.go &
+go run src/hello/hello.go &

toolset/setup/linux/languages/dart.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/dart-sdk.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+DART_HOME=$IROOT/dart-sdk
+RETCODE=$(fw_exists ${DART_HOME}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $DART_HOME.installed
+  return 0; }
 
 fw_get http://storage.googleapis.com/dart-archive/channels/stable/release/42828/sdk/dartsdk-linux-x64-release.zip
 fw_unzip dartsdk-linux-x64-release.zip
 
-touch ${IROOT}/dart-sdk.installed
+echo "export DART_HOME=${DART_HOME}" > $IROOT/dart-sdk.installed
+echo "export PUB_CACHE=${IROOT}/.pubcache" >> $IROOT/dart-sdk.installed
+echo -e "export PATH=${DART_HOME}/bin:\$PATH" >> $IROOT/dart-sdk.installed
+
+source $IROOT/dart-sdk.installed

toolset/setup/linux/languages/erlang.sh

@@ -1,12 +1,16 @@
 #!/bin/bash
 
 RETCODE=$(fw_exists ${IROOT}/erlang.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/erlang.installed
+  return 0; }
 
-wget http://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb
+fw_get http://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb
 sudo dpkg -i erlang-solutions_1.0_all.deb
 
 sudo apt-get -y update
 sudo apt-get install -y esl-erlang
 
-touch ${IROOT}/erlang.installed
+echo "" > $IROOT/erlang.installed
+
+source $IROOT/erlang.installed

toolset/setup/linux/languages/go.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/go1.4.2.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+VERSION=1.4.2
+GOROOT=$IROOT/go
+RETCODE=$(fw_exists ${GOROOT}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $GOROOT.installed
+  return 0; }
 
-fw_get https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
-fw_untar go1.4.2.linux-amd64.tar.gz
+fw_get https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz
+fw_untar go$VERSION.linux-amd64.tar.gz
 
-touch ${IROOT}/go1.4.2.installed
+echo "export GOROOT=${IROOT}/go" > $GOROOT.installed
+echo -e "export PATH=${GOROOT}/bin:\$PATH" >> $GOROOT.installed
+
+source $GOROOT.installed

toolset/setup/linux/systools/rebar.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists $IROOT/rebar.installed)
-[ ! "$RETCODE" == 0 ] || { return 0; }
+REBAR_HOME=$IROOT/rebar
+RETCODE=$(fw_exists ${REBAR_HOME}.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $REBAR_HOME.installed
+  return 0; }
 
 fw_get https://github.com/rebar/rebar/archive/2.5.1.tar.gz -O rebar-2.5.1.tar.gz
 fw_untar rebar-2.5.1.tar.gz
@@ -9,4 +12,7 @@ mv rebar-2.5.1 rebar
 cd rebar
 ./bootstrap
 
-touch $IROOT/rebar.installed
+echo "export REBAR_HOME=${REBAR_HOME}" > $REBAR_HOME.installed
+echo -e "export PATH=${REBAR_HOME}:\$PATH" >> $REBAR_HOME.installed
+
+source $REBAR_HOME.installed

toolset/setup/linux/webservers/nginx.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/nginx.installed)
+NGINX_HOME=$IROOT/nginx
+RETCODE=$(fw_exists ${NGINX_HOME}.installed)
 [ ! "$RETCODE" == 0 ] || { \
-  source $IROOT/nginx.installed
+  source $NGINX_HOME.installed
   return 0; }
 
 fw_get http://nginx.org/download/nginx-1.4.1.tar.gz
@@ -11,12 +12,13 @@ cd nginx-1.4.1
 
 # There is no --quiet flag that I could find...
 echo "Configuring nginx..."
-./configure --prefix=$IROOT/nginx > /dev/null
+./configure --prefix=$NGINX_HOME > /dev/null
 
 echo "Compiling and installing nginx..."
 make --quiet
 make --quiet install
 
-echo "export PATH=${IROOT}/nginx/sbin:${PATH}" > ${IROOT}/nginx.installed
+echo "export NGINX_HOME=${NGINX_HOME}" > $NGINX_HOME.installed
+echo -e "export PATH=${IROOT}/nginx/sbin:\$PATH" >> $NGINX_HOME.installed
 
-source $IROOT/nginx.installed
+source $NGINX_HOME.installed