X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=4ce3ec4f1a1b75851d49c16696a2d69e4d9e93cb;hb=refs%2Fheads%2Fv2.17.x;hp=67c73453b62194f465a7146cad6f82ab59c52d35;hpb=a4105c6e8dc83407abc9b12e80c958673c942888;p=dcpomatic.git diff --git a/cscript b/cscript index 67c73453b..4612c7d5d 100644 --- a/cscript +++ b/cscript @@ -533,8 +533,8 @@ def make_spec(filename, version, target, options, requires=None): print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f) def dependencies(target, options): - deps = [('libdcp', '9b9af8a80860210c6a29446f7a24795eeda9e7bc', {'c++17': target.platform == 'osx'})] - deps.append(('libsub', 'v1.6.47')) + deps = [('libdcp', 'v1.9.8', {'c++17': target.platform == 'osx'})] + deps.append(('libsub', 'v1.6.49')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we @@ -935,7 +935,11 @@ def test(target, options, test): if target.platform == 'windows': cmd = 'run\\tests ' else: - cmd = 'run/tests --check --log_level=test_suite ' + cmd = 'run/tests ' + if target.environment_prefix: + cmd += '-e %s ' % target.environment_prefix + if target.platform != 'windows': + cmd += ' --check --log_level=test_suite ' if target.debug: cmd += '--backtrace ' if test is not None: