Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HYDRA-694 : Remove idiff workaround #29

Merged
merged 1 commit into from
Dec 20, 2023
Merged

HYDRA-694 : Remove idiff workaround #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions test/testUtils/imageUtils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,20 +180,6 @@ def imageDiff(imagePath1, imagePath2, verbose, fail, failpercent, hardfail,
sys.__stdout__.write("\nimage diffing with {0}".format(cmd))
sys.__stdout__.flush()

# LD_LIBRARY_PATH(or PATH or DYLD_LIBRARY_PATH) needs to be set for the idiff executable because its
# RPATH is absolute rather than relative to ORIGIN, meaning the RPATH
# points to the absolute path on the machine where idiff was built.
# This absence of relative paths for RPATH comes from OpenImageIO.
# We introduce a second workaround to avoid Maya using usd's libpng,
# because both use incompatible versions of libpng. This is done by
# setting LD_LIBRARY_PATH to IDIFF_LD_LIBRARY_PATH only when we run
# idiff using Python's subprocess module.

if sys.platform == "darwin":
os.environ["DYLD_LIBRARY_PATH"] = os.environ['IDIFF_LD_LIBRARY_PATH']
elif sys.platform.startswith("linux"):
os.environ["LD_LIBRARY_PATH"] = os.environ['IDIFF_LD_LIBRARY_PATH']

# Run idiff command
proc = subprocess.run(cmd, shell=False, env=os.environ.copy(), stdout=subprocess.PIPE)
return proc
Expand Down