Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Enno Rehling 2018-11-04 12:12:52 +01:00
commit 9a309e1e30
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
s/preview
View file

@ -55,7 +55,8 @@ cd $TESTROOT
cat >| eressea.ini <<HEREDOC cat >| eressea.ini <<HEREDOC
[lua] [lua]
dbname = preview.db dbname = eressea.db
dbswap = :memory:
install = $SOURCE install = $SOURCE
paths = $SOURCE/lunit:$SOURCE/git/scripts paths = $SOURCE/lunit:$SOURCE/git/scripts
rules = e$game rules = e$game
@ -70,7 +71,6 @@ cd $TESTROOT
[ -d data ] || mkdir data [ -d data ] || mkdir data
assert_dir data assert_dir data
assert_files $LIVE/orders.$turn $LIVE/data/$turn.dat assert_files $LIVE/orders.$turn $LIVE/data/$turn.dat
cp $LIVE/eressea.db preview.db
ln -f $LIVE/orders.$turn ln -f $LIVE/orders.$turn
ln -f $LIVE/data/$turn.dat data/ ln -f $LIVE/data/$turn.dat data/
rm -rf reports rm -rf reports