diff options
| author | Benjamin Frank <ben+github@pipsfrank.de> | 2016-07-05 21:40:33 +0200 |
|---|---|---|
| committer | Benjamin Frank <ben+github@pipsfrank.de> | 2016-07-06 11:06:28 +0200 |
| commit | c8733351614bed77bd72708fdb12b36268cb2a28 (patch) | |
| tree | 60e069857eefee238406202a1a0ba4e690017025 /cbt | |
| parent | 11342ecc8c6bd92e73b8ad9a2791f8d9462043a6 (diff) | |
| download | cbt-c8733351614bed77bd72708fdb12b36268cb2a28.tar.gz cbt-c8733351614bed77bd72708fdb12b36268cb2a28.tar.bz2 cbt-c8733351614bed77bd72708fdb12b36268cb2a28.zip | |
Support proxy settings in CBT.
Proxy settings can be supplied either via Java system-properties or via
environment variables (http_proxy/https_proxy/no_proxy).
Java system-properties take precedence over env vars. Evaluation of
proxy settings happens only during nailgun startup for now.
Diffstat (limited to 'cbt')
| -rwxr-xr-x | cbt | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -195,7 +195,7 @@ stage1 () { then log "Running JVM directly" $* # -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=localhost:5005 - java -Xmx6072m -Xss10M -cp $NAILGUN$TARGET cbt.NailgunLauncher $(time_taken) "$CWD" $* + java $JAVA_OPTS -Xmx6072m -Xss10M -cp $NAILGUN$TARGET cbt.NailgunLauncher $(time_taken) "$CWD" $* else log "Running via nailgun." $* for i in 0 1 2 3 4 5 6 7 8 9; do |