diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-17 00:23:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-17 00:23:05 +0000 |
| commit | ac265d3d008328b9bdaf00c39ebcd86f263605c7 (patch) | |
| tree | 777819f4898b3b18dd9d8f71c9146d2dc72f4f95 | |
| parent | 2e93ca3670e5581b5523f60130b38594de10d6c3 (diff) | |
| parent | 228c3f410a7b3a9ad1d6b0186dc185d69ec0f52c (diff) | |
Merge branch 'master' into 1.0
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | test/encryption_test.cc | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index f7fb9ff8..b7b5c238 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "test/private"] path = test/private - url = ssh://carlh.dyndns.org/home/carl/git/libdcp-test.git + url = ../libdcp-test.git diff --git a/test/encryption_test.cc b/test/encryption_test.cc index b4a89544..d029d4d5 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -116,8 +116,12 @@ BOOST_AUTO_TEST_CASE (encryption_test) "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml " "> build/test/xmllint.log 2>&1 < /dev/null" ); - + +#ifdef DCPOMATIC_POSIX BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); +#else + BOOST_CHECK_EQUAL (r, 0); +#endif r = system ("xmlsec1 verify " "--pubkey-cert-pem test/ref/crypt/leaf.signed.pem " @@ -127,5 +131,9 @@ BOOST_AUTO_TEST_CASE (encryption_test) "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate " "build/test/bar.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null"); +#ifdef DCPOMATIC_POSIX BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); +#else + BOOST_CHECK_EQUAL (r, 0); +#endif } |