Browse Source

Restore autotest config on SIGINT or SIGTERM

When hitting Ctrl+C to interrupt unit test running, the old
configuration was not restored properly.

This fix traps the signal to properly restore the configuration after an
interruption.
tags/v8.0.0alpha1
Vincent Petry 9 years ago
parent
commit
6ed174d0e4
1 changed files with 11 additions and 5 deletions
  1. 11
    5
      autotest.sh

+ 11
- 5
autotest.sh View File

@@ -63,6 +63,16 @@ if [ -f config/config.php ]; then
mv config/config.php config/config-autotest-backup.php
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
if [ -d /dev/shm ]; then
DATADIR=/dev/shm/data-autotest$EXECUTOR_NUMBER
@@ -220,11 +230,7 @@ fi

cd $BASEDIR

# Restore existing config
if [ -f config/config-autotest-backup.php ]; then
mv config/config-autotest-backup.php config/config.php
fi

restore_config
#
# NOTES on mysql:
# - CREATE DATABASE oc_autotest;

Loading…
Cancel
Save