Changeset d0c91a6 for tests/pybin/tools.py

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into jenkins-sandbox

File:

• tests/pybin/tools.py (modified) (2 diffs)

tests/pybin/tools.py

@@ -79 +79 @@
 def diff( lhs, rhs ):
         # diff the output of the files
-        diff_cmd = ("diff --ignore-all-space --text "
-                                "--ignore-blank-lines "
+        diff_cmd = ("diff --text "
+#                               "--ignore-all-space "
+#                               "--ignore-blank-lines "
                                 "--old-group-format='\t\tmissing lines :\n"
                                 "%%<' \\\n"
@@ -246 +247 @@
         if column:
                 cmd = "%s 2> /dev/null" % column
-                print(cmd)
                 proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
-                proc.communicate(input=text)
+                proc.communicate(input=text + "\n")
         else:
                 print(text)