Skip to content

Commit 43b04c3

Browse files
johnhaddonjohnhaddon
committed
ldPreloadForRenderMan27
1 parent 4865058 commit 43b04c3

File tree

2 files changed

+76
-74
lines changed

2 files changed

+76
-74
lines changed

‎.github/workflows/main.yml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -197,80 +197,80 @@ jobs:
197197
env:
198198
PYTHONUTF8: 1
199199

200-
- name: Test
201-
# Tests should complete in well under an hour. If they don't it's most likely because
202-
# of a hang, in which case we'd like to know more quickly than the default 6hr timeout
203-
# allows.
204-
timeout-minutes: 60
205-
run: |
206-
echo "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json"
207-
${{ matrix.testRunner }} ${{ env.GAFFER_BUILD_DIR }}/bin/gaffer test ${{ matrix.testArguments }}
208-
echo "::remove-matcher owner=unittest::"
209-
210-
- name: Build and test Arnold extension
211-
run: |
212-
import subprocess
213-
import sys
214-
import os
215-
216-
for arnoldVersion in [ "7.3.1.0", "7.4.1.0" ] :
217-
arnoldRoot = os.path.join( os.environ["GITHUB_WORKSPACE"], "arnoldRoot", arnoldVersion )
218-
os.environ["ARNOLD_ROOT"] = arnoldRoot
219-
220-
subprocess.check_call(
221-
[
222-
sys.executable,
223-
".github/workflows/main/installArnold.py",
224-
"--version",
225-
arnoldVersion
226-
]
227-
)
228-
#Build Arnold extension
229-
subprocess.check_call( "scons -j ${{ matrix.jobs }} build BUILD_TYPE=${{ matrix.buildType }} OPTIONS=.github/workflows/main/sconsOptions", shell = True )
230-
231-
# Test Arnold extension
232-
print( "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json" )
233-
testCommand = os.path.join( os.environ["GAFFER_BUILD_DIR"], "bin", "gaffer" if os.name != "nt" else "gaffer.cmd" )
234-
if os.name == "nt" :
235-
testCommand = testCommand.lstrip( "./\\" )
236-
subprocess.check_call( "${{ matrix.testRunner }} " + testCommand + " test IECoreArnoldTest GafferArnoldTest GafferArnoldUITest", shell = True )
237-
print( "::remove-matcher owner=unittest::" )
238-
239-
# Publish ARNOLD_ROOT to the environment for subsequent steps,
240-
# so we can build the docs for GafferArnold.
241-
with open( os.environ["GITHUB_ENV"], "a" ) as f :
242-
print( "Setting $ARNOLD_ROOT to '%s'" % arnoldRoot )
243-
f.write( 'ARNOLD_ROOT=%s\n' % arnoldRoot )
244-
env:
245-
PYTHONUTF8: 1
246-
ARNOLD_DOWNLOAD_USER: ${{ secrets.ARNOLD_DOWNLOAD_USER }}
247-
ARNOLD_DOWNLOAD_PASSWORD: ${{ secrets.ARNOLD_DOWNLOAD_PASSWORD }}
248-
shell: python
249-
# We can't build GafferArnold for pull requests from forks, because the
250-
# authentication secrets for downloading Arnold aren't available (this is
251-
# a GitHub security restriction). The core development team can still build
252-
# GafferArnold for pull requests by pushing a branch to the main repo and
253-
# making a pull request from there.
254-
if: ${{ env.ARNOLD_DOWNLOAD_USER != '' }}
255-
256-
- name: Install RenderMan 26.3
257-
run: ./.github/workflows/main/installRenderMan.py --version 26.3 --outputFormat "RMANTREE={rmanTree}" >> $GITHUB_ENV
258-
shell: bash
259-
env:
260-
RENDERMAN_DOWNLOAD_USER: ${{ secrets.RENDERMAN_DOWNLOAD_USER }}
261-
RENDERMAN_DOWNLOAD_PASSWORD: ${{ secrets.RENDERMAN_DOWNLOAD_PASSWORD }}
262-
RENDERMAN_LICENSE_PASSPHRASE: ${{ secrets.RENDERMAN_LICENSE_PASSPHRASE }}
263-
if: ${{ env.RENDERMAN_DOWNLOAD_USER != '' }}
264-
265-
- name: Build and test against RenderMan 26.3
266-
run: |
267-
scons -j ${{ matrix.jobs }} build BUILD_TYPE=${{ matrix.buildType }} OPTIONS=.github/workflows/main/sconsOptions
268-
echo "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json"
269-
${{ matrix.testRunner }} ${{ env.GAFFER_BUILD_DIR }}/bin/gaffer test ${{ matrix.testArguments }} IECoreRenderManTest GafferRenderManTest GafferRenderManUITest
270-
echo "::remove-matcher owner=unittest::"
271-
env:
272-
PYTHONUTF8: 1
273-
if: ${{ env.RMANTREE != '' }}
200+
# - name: Test
201+
# # Tests should complete in well under an hour. If they don't it's most likely because
202+
# # of a hang, in which case we'd like to know more quickly than the default 6hr timeout
203+
# # allows.
204+
# timeout-minutes: 60
205+
# run: |
206+
# echo "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json"
207+
# ${{ matrix.testRunner }} ${{ env.GAFFER_BUILD_DIR }}/bin/gaffer test ${{ matrix.testArguments }}
208+
# echo "::remove-matcher owner=unittest::"
209+
210+
# - name: Build and test Arnold extension
211+
# run: |
212+
# import subprocess
213+
# import sys
214+
# import os
215+
216+
# for arnoldVersion in [ "7.3.1.0", "7.4.1.0" ] :
217+
# arnoldRoot = os.path.join( os.environ["GITHUB_WORKSPACE"], "arnoldRoot", arnoldVersion )
218+
# os.environ["ARNOLD_ROOT"] = arnoldRoot
219+
220+
# subprocess.check_call(
221+
# [
222+
# sys.executable,
223+
# ".github/workflows/main/installArnold.py",
224+
# "--version",
225+
# arnoldVersion
226+
# ]
227+
# )
228+
# #Build Arnold extension
229+
# subprocess.check_call( "scons -j ${{ matrix.jobs }} build BUILD_TYPE=${{ matrix.buildType }} OPTIONS=.github/workflows/main/sconsOptions", shell = True )
230+
231+
# # Test Arnold extension
232+
# print( "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json" )
233+
# testCommand = os.path.join( os.environ["GAFFER_BUILD_DIR"], "bin", "gaffer" if os.name != "nt" else "gaffer.cmd" )
234+
# if os.name == "nt" :
235+
# testCommand = testCommand.lstrip( "./\\" )
236+
# subprocess.check_call( "${{ matrix.testRunner }} " + testCommand + " test IECoreArnoldTest GafferArnoldTest GafferArnoldUITest", shell = True )
237+
# print( "::remove-matcher owner=unittest::" )
238+
239+
# # Publish ARNOLD_ROOT to the environment for subsequent steps,
240+
# # so we can build the docs for GafferArnold.
241+
# with open( os.environ["GITHUB_ENV"], "a" ) as f :
242+
# print( "Setting $ARNOLD_ROOT to '%s'" % arnoldRoot )
243+
# f.write( 'ARNOLD_ROOT=%s\n' % arnoldRoot )
244+
# env:
245+
# PYTHONUTF8: 1
246+
# ARNOLD_DOWNLOAD_USER: ${{ secrets.ARNOLD_DOWNLOAD_USER }}
247+
# ARNOLD_DOWNLOAD_PASSWORD: ${{ secrets.ARNOLD_DOWNLOAD_PASSWORD }}
248+
# shell: python
249+
# # We can't build GafferArnold for pull requests from forks, because the
250+
# # authentication secrets for downloading Arnold aren't available (this is
251+
# # a GitHub security restriction). The core development team can still build
252+
# # GafferArnold for pull requests by pushing a branch to the main repo and
253+
# # making a pull request from there.
254+
# if: ${{ env.ARNOLD_DOWNLOAD_USER != '' }}
255+
256+
# - name: Install RenderMan 26.3
257+
# run: ./.github/workflows/main/installRenderMan.py --version 26.3 --outputFormat "RMANTREE={rmanTree}" >> $GITHUB_ENV
258+
# shell: bash
259+
# env:
260+
# RENDERMAN_DOWNLOAD_USER: ${{ secrets.RENDERMAN_DOWNLOAD_USER }}
261+
# RENDERMAN_DOWNLOAD_PASSWORD: ${{ secrets.RENDERMAN_DOWNLOAD_PASSWORD }}
262+
# RENDERMAN_LICENSE_PASSPHRASE: ${{ secrets.RENDERMAN_LICENSE_PASSPHRASE }}
263+
# if: ${{ env.RENDERMAN_DOWNLOAD_USER != '' }}
264+
265+
# - name: Build and test against RenderMan 26.3
266+
# run: |
267+
# scons -j ${{ matrix.jobs }} build BUILD_TYPE=${{ matrix.buildType }} OPTIONS=.github/workflows/main/sconsOptions
268+
# echo "::add-matcher::./.github/workflows/main/problemMatchers/unittest.json"
269+
# ${{ matrix.testRunner }} ${{ env.GAFFER_BUILD_DIR }}/bin/gaffer test ${{ matrix.testArguments }} IECoreRenderManTest GafferRenderManTest GafferRenderManUITest
270+
# echo "::remove-matcher owner=unittest::"
271+
# env:
272+
# PYTHONUTF8: 1
273+
# if: ${{ env.RMANTREE != '' }}
274274

275275
- name: Install RenderMan 27.0
276276
run: |

‎.github/workflows/main/testGafferRenderMan.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ set -e
88

99
microdnf install -y lcms2 mesa-libGL mesa-libGLU libglvnd-opengl fontconfig libgomp numactl-libs
1010

11+
export LD_PRELOAD=libSegFault.so
12+
1113
# Run the tests.
1214
## \todo Run GafferRenderManUITest as well. To do this we need to install some
1315
# additional packages above, and modify the `podman run` call in `main.yml` so

0 commit comments

Comments
 (0)