diff options
| author | Eugene Tarassov | 2015-11-13 00:23:17 +0000 |
|---|---|---|
| committer | Eugene Tarassov | 2015-11-13 00:23:17 +0000 |
| commit | 2424f97a39a1defbb2b7072f530a6f72c9cc3c48 (patch) | |
| tree | b2f22e7441a33da14c29acf2d8b590ff88643eba /tests | |
| parent | fc13b4400c49f30302597fbcf9904b71291da5a1 (diff) | |
| download | org.eclipse.tcf-2424f97a39a1defbb2b7072f530a6f72c9cc3c48.tar.gz org.eclipse.tcf-2424f97a39a1defbb2b7072f530a6f72c9cc3c48.tar.xz org.eclipse.tcf-2424f97a39a1defbb2b7072f530a6f72c9cc3c48.zip | |
TCF Tests: fixed few minor issues
1. allow to override VBOXHOST
2. time command output should go to log file instead of stderr
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/test-all | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/test-all b/tests/test-all index b88344719..4fecc1076 100755 --- a/tests/test-all +++ b/tests/test-all @@ -21,7 +21,11 @@ then exit 1 fi -VBOXHOST=192.168.155.1 +if [ -z "$VBOXHOST" ] +then + VBOXHOST=192.168.155.1 + echo "VBOXHOST is set to $VBOXHOST" +fi rm -rf java-bin || exit 1 mkdir java-bin || exit 1 @@ -267,10 +271,10 @@ function build_and_test_agent() echo >>logs/$LOGFILE echo "Starting tests, target: $TESTURL1" >>logs/$LOGFILE - if time -p java -ea \ + if ( time -p java -ea \ -classpath java-bin \ org.eclipse.tcf.internal.debug.tests.Main \ - $TESTURL1 \ + $TESTURL1 ) \ >>logs/$LOGFILE 2>&1 then if [ -s logs/agent-$HOST.txt ] ; then @@ -327,10 +331,10 @@ function build_and_test_agent() sleep 5 echo >>logs/$LOGFILE echo "Starting tests, target: $TESTURL2 $TESTURL1" >>logs/$LOGFILE - if time -p java -ea \ + if ( time -p java -ea \ -classpath java-bin \ org.eclipse.tcf.internal.debug.tests.Main \ - $TESTURL2 $TESTURL1 \ + $TESTURL2 $TESTURL1 ) \ >>logs/$LOGFILE 2>&1 then if [ -s logs/agent-$HOST.txt ] ; then |