changes to skip tests on ubuntu-next when gcj and not real java, and also when no latex is available

3 files changed, 15 insertions, 2 deletions

diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index 24d4bdd4..42c19037 100644
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -35,6 +35,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 c26b010c..9e79320e 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 7e94be39..37a839bf 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")