Test script tweaks for Windows.

diff --git a/cscript b/cscript
index 61dd60c0690e5ebd609f938a08c0504174be0a57..0e83527578c58541cc719b4911de0ff5fc279cc3 100644 (file)
--- a/cscript
+++ b/cscript
@@ -741,7 +741,10 @@ def make_manual(target):
 
 def test(target, options, test):
     target.set('LC_ALL', 'C')
-    cmd = 'run/tests '
+    if target.platform == 'windows':
+        cmd = 'run\\tests'
+    else:
+        cmd = 'run/tests '
     if target.debug:
         cmd += '--backtrace '
     if test is not None:

diff --git a/run/tests.bat b/run/tests.bat
index 4834d579048653e4d53682cd5bfb224885ae0632..9db371a435773180b2cf6567c64b7ba986e8fee9 100644 (file)
--- a/run/tests.bat
+++ b/run/tests.bat
@@ -1,3 +1,6 @@
-set PATH=%PATH%;c:\users\ci\bin;c:\users\ci\build\bin
+set PATH=%PATH%;c:\users\ci\bin;c:\users\ci\workspace\dcpomatic\bin
 set DCPOMATIC_TEST_PRIVATE=c:\users\ci\dcpomatic-test-private
+xcopy ..\libdcp\tags build\tags\
+copy ..\openssl\apps\openssl.exe build\test\
+xcopy fonts build\fonts\
 build\test\unit-tests.exe