diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-01-20 10:30:03 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2012-01-20 10:30:03 +0000 |
| commit | 272923e03232e07cca23abf51618c819807122e1 (patch) | |
| tree | e642a519c91205e1eb935da241841bc2c750dc10 /tests/integration_base_files | |
| parent | 068b75f818d135e65300693bab311074745d8133 (diff) | |
| download | vaadin-framework-272923e03232e07cca23abf51618c819807122e1.tar.gz vaadin-framework-272923e03232e07cca23abf51618c819807122e1.zip | |
Merge from 6.7
svn changeset:22729/svn branch:6.8
Diffstat (limited to 'tests/integration_base_files')
| -rw-r--r-- | tests/integration_base_files/cleanup.sh | 3 | ||||
| -rw-r--r-- | tests/integration_base_files/lock_age.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/integration_base_files/cleanup.sh b/tests/integration_base_files/cleanup.sh index 42fb5a434d..44e2e5f6ee 100644 --- a/tests/integration_base_files/cleanup.sh +++ b/tests/integration_base_files/cleanup.sh @@ -23,4 +23,5 @@ if [ -a /home/integration/demo.war ] fi echo Cleaning deploy dir -rm -rf /home/integration/deploy/* +ant -f /home/integration/deploy.xml clean + diff --git a/tests/integration_base_files/lock_age.sh b/tests/integration_base_files/lock_age.sh index 6b78acb590..115a8fef79 100644 --- a/tests/integration_base_files/lock_age.sh +++ b/tests/integration_base_files/lock_age.sh @@ -8,7 +8,7 @@ if lockfile -r0 -! /home/integration/deploy/lock.file &> /dev/null AGE=$[($DATE - $LOCK_AGE)/60] - if [ "$AGE" -gt "15" ] + if [ "$AGE" -gt "20" ] then echo lock.file is $AGE min old. ./cleanup.sh |