unit tests (finally) run on windows. phew

Raptura · Nov 23, 2014 · 16bce6b · 16bce6b
1 parent b73d0f0
commit 16bce6b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CTestCustom.cmake b/CTestCustom.cmake
diff --git a/Makefile b/Makefile
@@ -36,7 +36,11 @@ configure:
 
 	# create the temporary build directory if needed
 	@mkdir -p pod-build
-	@cd pod-build && ln -sf ../CTestCustom.cmake  # actually has to live in the build path
+ifeq ($(shell uname -o),Cygwin)
+	@echo "set(CTEST_CUSTOM_PRE_TEST \"`which bash | cygpath -f - -w | sed -e 's/\\\\/\\\\\\\\/g'` -l -c \\\"`pwd`/cmake/add_matlab_unit_tests.pl `pwd`\\\"\")" > pod-build/CTestCustom.cmake 
+else
+	@echo "set(CTEST_CUSTOM_PRE_TEST \"../cmake/add_matlab_unit_tests.pl ..\")" > pod-build/CTestCustom.cmake # actually has to live in the build path
+endif
 
 	# run CMake to generate and configure the build scripts
 	@cd pod-build && cmake $(CMAKE_FLAGS) -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \

diff --git a/cmake b/cmake
diff --git a/util/unitTest.m b/util/unitTest.m
@@ -422,7 +422,7 @@ function expandAll(tree,node)
           [tf] = checkFile(files(i).name,'RUN_SERIAL');
           if (tf), test_properties = sprintf('%s RUN_SERIAL',test_properties); end
 
-          fprintf(options.test_list_file,[testname,'.',m{j},'\t',pwd,'\t',test_properties,'\n']);
+          fprintf(options.test_list_file,'%s.%s\t%s\t%s\n',testname,m{j},pwd,test_properties);
         end
 
         if options.gui
@@ -451,7 +451,7 @@ function expandAll(tree,node)
         [tf] = checkFile(files(i).name,'RUN_SERIAL');
         if (tf), test_properties = sprintf('%s RUN_SERIAL',test_properties); end 
 
-        fprintf(options.test_list_file,[testname,'\t',pwd,'\t',test_properties,'\n']);
+        fprintf(options.test_list_file,'%s\t%s\t%s\n',testname,pwd,test_properties);
       end
 
       if (options.gui)