diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-20 20:49:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-05-04 19:37:38 +0200 |
| commit | 80a97d01ba21df6d06ca750789bfe0bbacaaee4a (patch) | |
| tree | 8a42399a2bd5b27eb9252ae574427100a2a556f3 /test/encryption_test.cc | |
| parent | df504d64b878a409d469df8a166558919e3c2afb (diff) | |
Allow tests to be run on Windows.
Diffstat (limited to 'test/encryption_test.cc')
| -rw-r--r-- | test/encryption_test.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index dd7ccadb..93cea8dc 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -157,13 +157,15 @@ BOOST_AUTO_TEST_CASE (encryption_test) int r = system ( "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/encryption_test.kdm.xml " +#ifndef LIBDCP_WINDOWS "> build/test/xmllint.log 2>&1 < /dev/null" +#endif ); #ifdef LIBDCP_WINDOWS BOOST_CHECK_EQUAL (r, 0); #else - BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0); + BOOST_CHECK_EQUAL (WEXITSTATUS(r), 0); #endif r = system ("xmlsec1 verify " @@ -171,8 +173,12 @@ BOOST_AUTO_TEST_CASE (encryption_test) "--trusted-pem test/ref/crypt/intermediate.signed.pem " "--trusted-pem test/ref/crypt/ca.self-signed.pem " "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPublic " - "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate " - "build/test/encryption_test.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null"); + "--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate --crypto openssl " + "build/test/encryption_test.kdm.xml " +#ifndef LIBDCP_WINDOWS + "> build/test/xmlsec1.log 2>&1 < /dev/null" +#endif + ); #ifdef LIBDCP_WINDOWS BOOST_CHECK_EQUAL (r, 0); |