Changeset e67a82d for tests/pybin/tools.py

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• tests/pybin/tools.py (modified) (1 diff)

tests/pybin/tools.py

@@ -246 +246 @@
 # transform path to canonical form
 def canonical_path(path):
-        abspath = os.path.abspath(__main__.__file__)
+        abspath = os.path.abspath(os.path.realpath(__main__.__file__))
         dname = os.path.dirname(abspath)
         return os.path.join(dname, os.path.normpath(path) )