commit 51fb454f71a9814486b5f3ad14bfad4d9c950596
author Dean Troyer <dtroyer@gmail.com> Fri Mar 09 22:21:59 2012 -0600
committer Dean Troyer <dtroyer@gmail.com> Mon Mar 12 11:44:32 2012 -0500
tree a93d0a4a6b8e08387268036046013682f3021f6d
parent 8da5656ffd8b28d88536efbe6d452ab86c3b3e74

Create exerciserc to configure exercises

* Move timeouts from openrc to (new) exerciserc
* Update all exercise scripts
* Update HACKING.rst

Fixes bug 951315

Change-Id: Icc4ff03a7dcf0cc711e204046176fb5186990c17

exercises/swift.sh

diff --git a/exercises/swift.sh b/exercises/swift.sh
index 7609637..b70b85f 100755
--- a/exercises/swift.sh
+++ b/exercises/swift.sh
@@ -18,15 +18,18 @@
 # Settings
 # ========
 
-# Use openrc + stackrc + localrc for settings
-pushd $(cd $(dirname "$0")/.. && pwd) >/dev/null
+# Keep track of the current directory
+EXERCISE_DIR=$(cd $(dirname "$0") && pwd)
+TOP_DIR=$(cd $EXERCISE_DIR/..; pwd)
 
 # Import common functions
-source ./functions
+source $TOP_DIR/functions
 
 # Import configuration
-source ./openrc
-popd >/dev/null
+source $TOP_DIR/openrc
+
+# Import exercise configuration
+source $TOP_DIR/exerciserc
 
 # Container name
 CONTAINER=ex-swift