diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-01-19 17:30:41 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-01-19 17:30:41 (GMT) |
| commit | 358c0de48a7d9fecdb30e24505c066506dfcdeff (patch) | |
| tree | e3da370799409e61468868397770eeba5a5fe4bf /test/TEX | |
| parent | 374acc32ce7ebecbc23dae5859315ddee17e523b (diff) | |
| parent | 6cc2ad09d86e6da5812485b0e50a820e2560b31b (diff) | |
| download | SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.zip SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.gz SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.bz2 | |
Merge in default.
Diffstat (limited to 'test/TEX')
| -rw-r--r-- | test/TEX/TEX.py | 3 | ||||
| -rw-r--r-- | test/TEX/bibliography.py | 12 | ||||
| -rw-r--r-- | test/TEX/multi-run.py | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py index b749690..e1d634f 100644 --- a/test/TEX/TEX.py +++ b/test/TEX/TEX.py @@ -36,6 +36,9 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() +have_latex = test.where_is('latex') +if not have_latex: + test.skip_test('Could not find latex; skipping test(s).\n') test.write('mytex.py', r""" diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py index c26b010..9e79320 100644 --- a/test/TEX/bibliography.py +++ b/test/TEX/bibliography.py @@ -36,11 +36,19 @@ import TestSCons test = TestSCons.TestSCons() dvips = test.where_is('dvips') + +if not dvips: + test.skip_test("Could not find dvips; skipping test(s).\n") + bibtex = test.where_is('bibtex') +if not bibtex: + test.skip_test("Could not find bibtex; skipping test(s).\n") -if not dvips or not bibtex: - test.skip_test("Could not find dvips or bibtex; skipping test(s).\n") +have_latex = test.where_is('latex') +if not have_latex: + test.skip_test('Could not find latex; skipping test(s).\n') + test.write('SConstruct', """\ import os env = Environment(tools = ['tex', 'latex', 'dvips']) diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py index 7e94be3..37a839b 100644 --- a/test/TEX/multi-run.py +++ b/test/TEX/multi-run.py @@ -39,6 +39,8 @@ test = TestSCons.TestSCons() tex = test.where_is('tex') latex = test.where_is('latex') +if not latex: + test.skip_test("Could not find latex; skipping test(s).\n") if not tex and not latex: test.skip_test("Could not find tex or latex; skipping test(s).\n") |