projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change test utils to run from the source tree, #37340
[freeside.git]
/
FS-Test
/
bin
/
freeside-test-start
diff --git
a/FS-Test/bin/freeside-test-start
b/FS-Test/bin/freeside-test-start
index
4f12e32
..
ed8e131
100755
(executable)
--- a/
FS-Test/bin/freeside-test-start
+++ b/
FS-Test/bin/freeside-test-start
@@
-4,12
+4,15
@@
VERSION='5.0.1'
set -ae
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`
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)
# 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
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 \
fi
newtime=$(sudo -u freeside \