Fix TEX auxiliary test by normalizing ps output to avoid spurious failures (from Rob Managan)

2 files changed, 15 insertions, 0 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 17a2018d..36eb4071 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -547,6 +547,18 @@ class TestSCons(TestCommon):
         x = x.replace('line 1,', 'line %s,' % line)
         return x
 
+    def normalize_ps(self, s):
+        s = re.sub(r'(Creation|Mod)Date: .*',
+                   r'\1Date XXXX', s)
+        s = re.sub(r'%DVIPSSource:\s+TeX output\s.*',
+                   r'%DVIPSSource:   TeX output XXXX', s)
+        s = re.sub(r'/(BaseFont|FontName) /[A-Z0-9]{6}',
+                   r'/\1 /XXXXXX', s)
+        s = re.sub(r'BeginFont: [A-Z0-9]{6}',
+                   r'BeginFont: XXXXXX', s)
+
+        return s
+
     def normalize_pdf(self, s):
         s = re.sub(r'/(Creation|Mod)Date \(D:[^)]*\)',
                    r'/\1Date (D:XXXX)', s)
diff --git a/test/TEX/auxiliaries.py b/test/TEX/auxiliaries.py
index f69b6e66..f6d7cb8a 100644
--- a/test/TEX/auxiliaries.py
+++ b/test/TEX/auxiliaries.py
@@ -151,6 +151,9 @@ if pdf_output_1 != pdf_output_2:
     sys.stdout.flush()
     test.fail_test()
 
+ps_output_1 = test.normalize_ps(ps_output_1)
+ps_output_2 = test.normalize_ps(ps_output_2)
+
 if ps_output_1 != ps_output_2:
     import sys
     sys.stdout.write("***** 1.ps and 2.ps are different!\n")