Skip to content

Commit be75ae0

Browse files
committed
[win_build.bat] Update windows build batch file
Runs matlab tests from the commandline
1 parent 8d9bfa4 commit be75ae0

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

startuptests.m

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
addpath(genpath(pwd));
2+
RunTests;
3+
if (stats.errorCount > 0)
4+
exit(1);
5+
end
6+
exit(0);

win_build.bat

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@ECHO off
2+
SET MATLAB_BINARY=c:\work\MATLAB_R2011a\bin
23
REM Latest dependencies at https://projects.g-node.org/nix/
34
SET NIX_DEP=c:\work\nix-dep
45
REM clone nix source from https://github.com/G-Node/nix
@@ -82,8 +83,8 @@ COPY %NIX_BUILD_DIR%\nix.dll %NIX_MX_ROOT%\ /Y
8283
COPY %HDF5_BASE%\bin\hdf5.dll %NIX_MX_ROOT%\ /Y
8384
COPY %HDF5_BASE%\bin\msvcp120.dll %NIX_MX_ROOT%\ /Y
8485
COPY %HDF5_BASE%\bin\msvcr120.dll %NIX_MX_ROOT%\ /Y
85-
COPY %HDF5_BASE%\bin\szip.dll %NIX_MX_ROOT%\ /Y
8686
COPY %HDF5_BASE%\bin\zlib.dll %NIX_MX_ROOT%\ /Y
87+
COPY %HDF5_BASE%\bin\szip.dll %NIX_MX_ROOT%\ /Y
8788

8889
IF %PROCESSOR_ARCHITECTURE% == x86 (cmake .. -G "Visual Studio 12") ELSE (cmake .. -G "Visual Studio 12 Win64")
8990

@@ -100,6 +101,17 @@ COPY %NIX_MX_ROOT%\build\%BUILD_TYPE%\nix_mx.mexw* %NIX_MX_ROOT%\ /Y
100101
CD %NIX_MX_ROOT%
101102

102103
ECHO --------------------------------------------------------------------------
103-
ECHO Starting matlab ...
104+
ECHO Running nix-mx tests ...
104105
ECHO --------------------------------------------------------------------------
105-
Start %NIX_MX_ROOT%\startup.m
106+
SET PATH=%PATH%;%MATLAB_BINARY%
107+
SET TEST_LOG=nix-mx-build.log~
108+
matlab -wait -nodesktop -nosplash -logfile %TEST_LOG% -r startuptests
109+
110+
IF %ERRORLEVEL% == 1 (
111+
TYPE %TEST_LOG%
112+
ECHO --------------------------------------------------------------------------
113+
ECHO Matlab tests failed, check details above.
114+
ECHO --------------------------------------------------------------------------
115+
)
116+
117+
DEL %TEST_LOG%

0 commit comments

Comments
 (0)