summaryrefslogtreecommitdiff
path: root/FS-Test/bin/freeside-test-start
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2015-08-31 13:32:13 -0700
committerMark Wells <mark@freeside.biz>2015-08-31 13:32:13 -0700
commite949bed143088a77ba89a56ff2a25609a1050159 (patch)
tree3fbb2d15053d3da66ab7d9a8adb242633275de35 /FS-Test/bin/freeside-test-start
parent18b3f884eb44c9d0dea2cedc82c5788f7031e162 (diff)
change test utils to run from the source tree, #37340
Diffstat (limited to 'FS-Test/bin/freeside-test-start')
-rwxr-xr-xFS-Test/bin/freeside-test-start7
1 files changed, 5 insertions, 2 deletions
diff --git a/FS-Test/bin/freeside-test-start b/FS-Test/bin/freeside-test-start
index 4f12e325b..ed8e131a9 100755
--- a/FS-Test/bin/freeside-test-start
+++ b/FS-Test/bin/freeside-test-start
@@ -4,12 +4,15 @@ VERSION='5.0.1'
set -ae
+# get the parent directory of bin/(this script)
+testroot=$( dirname ${BASH_SOURCE[0]} )
+testroot=$( cd $testroot; cd ..; pwd )
+
echo "Stopping services."
sudo service freeside stop
sudo service apache2 stop
newname=freeside_`date +%Y%m%d`
-sharedir=$(perl -MFS::Test -e "print FS::Test::share_dir()")
# get company_name from existing DB, strip whitespace
# (if there is no existing DB, continue anyway)
@@ -34,7 +37,7 @@ fi
if [ $createdb = YES ]; then
echo "Creating new database from stock schema."
createdb --owner=freeside freeside
- sudo -u freeside psql freeside -q -f $sharedir/test.sql > /dev/null
+ sudo -u freeside psql freeside -q -f $testroot/share/test.sql > /dev/null
fi
newtime=$(sudo -u freeside \