Browse Source

Attempt to correct onthfly datadir folder

pull/203/head
Oliverpool 9 years ago
parent
commit
aab19d9906
  1. 4
      test/test_songbook/onthefly/content.onthefly.tex.control
  2. 5
      test/test_songbook/test_compilation.py

4
test/test_songbook/onthefly/content.onthefly.tex.control

@ -14,7 +14,7 @@
\makeatletter \makeatletter
\def\input@path{ % \def\input@path{ %
{@TEST_FOLDER@/onthefly/../content_datadir/latex/} % {@TEST_FOLDER@/onthefly/../content_datadir/latex/} %
{@DATA_FOLDER@/latex/} % {@LOCAL_DATA_FOLDER@/latex/} %
} }
\makeatother \makeatother
@ -39,7 +39,7 @@ guitar,
\usepackage{graphicx} \usepackage{graphicx}
\graphicspath{ % \graphicspath{ %
{@TEST_FOLDER@/onthefly/../content_datadir/} % {@TEST_FOLDER@/onthefly/../content_datadir/} %
{@DATA_FOLDER@/} % {@LOCAL_DATA_FOLDER@/} %
} }

5
test/test_songbook/test_compilation.py

@ -14,6 +14,7 @@ import yaml
from patacrep.files import path2posix, chdir from patacrep.files import path2posix, chdir
from patacrep.songbook import prepare_songbook from patacrep.songbook import prepare_songbook
from patacrep.build import SongbookBuilder from patacrep.build import SongbookBuilder
from patacrep import __DATADIR__
from .. import logging_reduced from .. import logging_reduced
from .. import dynamic # pylint: disable=unused-import from .. import dynamic # pylint: disable=unused-import
@ -92,6 +93,10 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
"@TEST_FOLDER@", "@TEST_FOLDER@",
path2posix(os.path.dirname(__file__)), path2posix(os.path.dirname(__file__)),
) )
expected = expected.replace(
"@LOCAL_DATA_FOLDER@",
path2posix(__DATADIR__),
)
expected = expected.replace( expected = expected.replace(
"@DATA_FOLDER@", "@DATA_FOLDER@",

Loading…
Cancel
Save