Merge branch 'master' into 1.0

diff --git a/.gitmodules b/.gitmodules
index f7fb9ff893d66df1b1b95cbeb75adf84efa06650..b7b5c238e25e791b80338d6d2998affc7070bab2 100644 (file)
--- 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 b4a895443b49d138bfaa101e39a913aa5e9aeca7..d029d4d5c5aeda75d99379d967d0a02d11b60c62 100644 (file)
--- 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 
 }