Move onthfly datadir_prefix

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

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