Amend 26ea1e1 for roundtrip tests

[lyx.git] / src / tex2lyx / test / runtests.py

diff --git a/src/tex2lyx/test/runtests.py b/src/tex2lyx/test/runtests.py
index 47db3cc442ed6e4e01eb85c790092477739b9c05..7c82909dedbedb5ea4908d6c44b350236d156022 100755 (executable)
--- a/src/tex2lyx/test/runtests.py
+++ b/src/tex2lyx/test/runtests.py
@@ -15,11 +15,24 @@
 # suffix, since I don't know how to transport command line arguments through
 # the autotools "make check" mechanism.
 
+from __future__ import print_function
+
 import os, string, sys, time, difflib, filecmp, subprocess, re
 
 def usage(prog_name):
   return "Usage: %s [uselyx2lyx] [<tex2lyx binary> [[<script dir>] [[<output dir>] [testfile]]]]" % prog_name
 
+pat_fl1 = re.compile(r'^#LyX file created by tex2lyx .*$')
+pat_fl2 = re.compile(r'^#LyX \d+\.\d+ created this file.*$')
+
+def compareLyx(lines1, lines2):
+    if lines1[1:] != lines2[1:]:
+        return False
+    if not pat_fl1.match(lines1[0]) and not pat_fl2.match(lines1[0]):
+        return False
+    if not pat_fl1.match(lines2[0]) and not pat_fl2.match(lines2[0]):
+        return False
+    return True
 
 def main(argv):
     # Parse and manipulate the command line arguments.
@@ -49,23 +62,29 @@ def main(argv):
     else:
         suffix = ""
     lyx = os.path.join(os.path.dirname(tex2lyx), "lyx" + suffix)
-    inputdir = os.path.dirname(argv[0])
+    inputdir = os.path.realpath(os.path.dirname(argv[0]))
     if len(argv) >= 4+skipcount:
-        outputdir = sys.argv[3+skipcount]
+        outputdir = os.path.realpath(sys.argv[3+skipcount])
     else:
 #        outputdir = inputdir
-        outputdir = os.path.join(os.path.dirname(tex2lyx), "test")
+        outputdir = os.path.realpath(os.path.join(os.path.dirname(tex2lyx), "test"))
 
     if len(argv) >= 5+skipcount:
         files = [sys.argv[4+skipcount]]
     else:
         files = ['test.ltx', \
+                 'algo2e.tex', \
+                 'beamer.tex', \
                  'box-color-size-space-align.tex', \
                  'CJK.tex', \
                  'CJKutf8.tex', \
                  'test-insets.tex', \
+                 'test-insets-basic.tex', \
+                 'test-memoir.tex', \
+                 'test-minted.tex', \
                  'test-modules.tex', \
                  'test-refstyle-theorems.tex', \
+                 'test-scr.tex', \
                  'test-structure.tex', \
                  'verbatim.tex', \
                  'XeTeX-polyglossia.tex']
@@ -82,12 +101,13 @@ def main(argv):
         else:
             lyxfile = os.path.join(outputdir, base + ".lyx")
             cmd = '%s -roundtrip -copyfiles -f %s %s' % (tex2lyx, texfile, lyxfile)
+        print('Executing: ' + cmd + "\n")
         proc = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         proc.wait()
         err = proc.returncode
         errorstring = proc.stderr.read()
         if not errorstring is None:
-            print errorstring
+            print(errorstring)
         if err != 0:
             errors.append(f)
         elif not overwrite:
@@ -102,18 +122,27 @@ def main(argv):
                           os.path.join(outputdir, base + ".lyx2.lyx"), uselyx2lyx)
                 if lyxfile2 is None:
                     errors.append(f)
-                elif not filecmp.cmp(lyxfile1, lyxfile2, False):
+                else:
                     t1 = time.ctime(os.path.getmtime(lyxfile1))
                     t2 = time.ctime(os.path.getmtime(lyxfile2))
                     f1 = open(lyxfile1, 'r')
                     f2 = open(lyxfile2, 'r')
                     lines1 = f1.readlines()
+                    i1 = 0
+                    for linex in lines1:
+                      if linex[:-1] == '\origin ' + inputdir + '/':
+                        lines1[i1] = '\origin ' + outputdir + '/' + "\n"
+                        break
+                      i1 = i1+1
                     lines2 = f2.readlines()
-                    diff = difflib.unified_diff(lines1, lines2, lyxfile1, lyxfile2, t1, t2)
                     f1.close()
                     f2.close()
-                    sys.stdout.writelines(diff)
-                    errors.append(f)
+                    # ignore the first line e.g. the version of lyx
+                    if not compareLyx(lines1, lines2):
+                        diff = difflib.unified_diff(lines1, lines2, lyxfile1, lyxfile2, t1, t2)
+                        sys.stdout.writelines(diff)
+                        errors.append(f)
+
 
     if len(errors) > 0:
         error('Converting the following files failed: %s' % ', '.join(errors))
@@ -122,6 +151,7 @@ def getlyxinput(lyx, lyxfx, lyxf, uselyx2lyx):
     if uselyx2lyx:
         cmd = '%s -E lyx %s %s' % (lyx, lyxf, lyxfx)
         sys.stdout.writelines(cmd)
+        sys.stdout.writelines("\n")
         if os.system(cmd) != 0:
             return None
         return lyxf