From 63927af99f385d3b38f774446bd84761e28cf43e Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Fri, 12 Feb 2016 08:16:54 +0100 Subject: [PATCH] Move onthfly datadir_prefix --- test/test_songbook/onthefly/content.onthefly.yaml | 4 ++-- test/test_songbook/test_compilation.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test_songbook/onthefly/content.onthefly.yaml b/test/test_songbook/onthefly/content.onthefly.yaml index c7b8018d..3d5b585f 100644 --- a/test/test_songbook/onthefly/content.onthefly.yaml +++ b/test/test_songbook/onthefly/content.onthefly.yaml @@ -1,6 +1,6 @@ book: pictures: yes - datadir: ../content_datadir + datadir: content_datadir lang: en template: default.tex chords: @@ -12,7 +12,7 @@ content: - sort: - songsection: Test of song section - cwd: - # relative to datadir + # relative to datadir 'song' dir path: ../content content: - tex: foo.tex diff --git a/test/test_songbook/test_compilation.py b/test/test_songbook/test_compilation.py index 6ff90b50..5ba50677 100644 --- a/test/test_songbook/test_compilation.py +++ b/test/test_songbook/test_compilation.py @@ -165,7 +165,8 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest): outputdir = os.path.dirname(base) outputname = os.path.basename(base) - songbook = prepare_songbook(sbyaml, outputdir, outputname, datadir_prefix=outputdir) + datadir_prefix = os.path.join(outputdir, '..') + songbook = prepare_songbook(sbyaml, outputdir, outputname, datadir_prefix=datadir_prefix) songbook['_error'] = "fix" songbook['_cache'] = True