mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10534 from owncloud/autotest-cleanuponinterrupt 

Restore autotest config on SIGINT or SIGTERM
This commit is contained in:
Morris Jobke 2014-08-20 09:45:07 +02:00
parent ea8c0bce08 6ed174d0e4
commit e3c0db1026
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autotest.sh
View File

@ -63,6 +63,16 @@ if [ -f config/config.php ]; then
mv config/config.php config/config-autotest-backup.php mv config/config.php config/config-autotest-backup.php
fi fi
function restore_config {
# Restore existing config
if [ -f config/config-autotest-backup.php ]; then
mv config/config-autotest-backup.php config/config.php
fi
}
# restore config on exit, even when killed
trap restore_config SIGINT SIGTERM
# use tmpfs for datadir - should speedup unit test execution # use tmpfs for datadir - should speedup unit test execution
if [ -d /dev/shm ]; then if [ -d /dev/shm ]; then
DATADIR=/dev/shm/data-autotest$EXECUTOR_NUMBER DATADIR=/dev/shm/data-autotest$EXECUTOR_NUMBER
@ -220,11 +230,7 @@ fi
cd $BASEDIR cd $BASEDIR
# Restore existing config restore_config
if [ -f config/config-autotest-backup.php ]; then
mv config/config-autotest-backup.php config/config.php
fi
# #
# NOTES on mysql: # NOTES on mysql:
# - CREATE DATABASE oc_autotest; # - CREATE DATABASE oc_autotest;