Merge remote-tracking branch 'upstream/3.4' into merge-3.4
This commit is contained in:
@@ -37,6 +37,13 @@ def execute(cmd, silent=False, cwd=".", env=None):
|
||||
new_env = os.environ.copy()
|
||||
new_env.update(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:
|
||||
return check_output(cmd, stderr=STDOUT, cwd=cwd, env=env).decode("latin-1")
|
||||
else:
|
||||
|
||||
@@ -755,6 +755,7 @@ static uint64_t memory_usage_base_opencl = 0;
|
||||
|
||||
void testSetUp()
|
||||
{
|
||||
fflush(stdout); fflush(stderr);
|
||||
cv::ipp::setIppStatus(0);
|
||||
cv::theRNG().state = cvtest::param_seed;
|
||||
cv::setNumThreads(cvtest::testThreads);
|
||||
|
||||
Reference in New Issue
Block a user