Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
52f16e0f
Commit
52f16e0f
authored
Apr 17, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: workaround for DYLD_LIBRARY_PATH on Apple MacOSX
parent
dedd9660
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
build.xml
modules/java/test/pure_test/build.xml
+1
-0
run_utils.py
modules/ts/misc/run_utils.py
+7
-0
No files found.
modules/java/test/pure_test/build.xml
View file @
52f16e0f
...
@@ -41,6 +41,7 @@
...
@@ -41,6 +41,7 @@
<junit
printsummary=
"true"
haltonfailure=
"false"
haltonerror=
"false"
showoutput=
"true"
logfailedtests=
"true"
maxmemory=
"256m"
>
<junit
printsummary=
"true"
haltonfailure=
"false"
haltonerror=
"false"
showoutput=
"true"
logfailedtests=
"true"
maxmemory=
"256m"
>
<sysproperty
key=
"java.library.path"
path=
"${opencv.lib.path}"
/>
<sysproperty
key=
"java.library.path"
path=
"${opencv.lib.path}"
/>
<env
key=
"PATH"
path=
"${opencv.lib.path}:${env.PATH}:${env.Path}"
/>
<env
key=
"PATH"
path=
"${opencv.lib.path}:${env.PATH}:${env.Path}"
/>
<env
key=
"DYLD_LIBRARY_PATH"
path=
"${env.OPENCV_SAVED_DYLD_LIBRARY_PATH}"
/>
<!-- https://github.com/opencv/opencv/issues/14353 -->
<classpath
refid=
"master-classpath"
/>
<classpath
refid=
"master-classpath"
/>
<classpath>
<classpath>
<pathelement
location=
"build/classes"
/>
<pathelement
location=
"build/classes"
/>
...
...
modules/ts/misc/run_utils.py
View file @
52f16e0f
...
@@ -37,6 +37,13 @@ def execute(cmd, silent=False, cwd=".", env=None):
...
@@ -37,6 +37,13 @@ def execute(cmd, silent=False, cwd=".", env=None):
new_env
=
os
.
environ
.
copy
()
new_env
=
os
.
environ
.
copy
()
new_env
.
update
(
env
)
new_env
.
update
(
env
)
env
=
new_env
env
=
new_env
if
sys
.
platform
==
'darwin'
:
# https://github.com/opencv/opencv/issues/14351
if
env
is
None
:
env
=
os
.
environ
.
copy
()
if
'DYLD_LIBRARY_PATH'
in
env
:
env
[
'OPENCV_SAVED_DYLD_LIBRARY_PATH'
]
=
env
[
'DYLD_LIBRARY_PATH'
]
if
silent
:
if
silent
:
return
check_output
(
cmd
,
stderr
=
STDOUT
,
cwd
=
cwd
,
env
=
env
)
.
decode
(
"latin-1"
)
return
check_output
(
cmd
,
stderr
=
STDOUT
,
cwd
=
cwd
,
env
=
env
)
.
decode
(
"latin-1"
)
else
:
else
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment