From ed24158b4d247dff58162c97f04cbc4011579600 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 10 Sep 2010 11:35:20 +0200
Subject: Add automated build and test scripts for Windows

---
 common/makefile |  3 ++-
 common/test.bat | 46 +++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 8 deletions(-)

(limited to 'common')

diff --git a/common/makefile b/common/makefile
index f575f74..346b8f8 100644
--- a/common/makefile
+++ b/common/makefile
@@ -28,7 +28,8 @@ name := $(notdir $(src_base))
 $(dist): name := $(name)
 $(dist): export dirs := $(tests)
 $(dist): export thread_dirs := $(thread_tests)
-$(dist): export extra_dist := $(call vc9slns,$(name)) $(call vc10slns,$(name))
+$(dist): export extra_dist :=  test.bat $(call vc9slns,$(name)) \
+$(call vc10slns,$(name))
 $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
 	$(call meta-automake)
 	$(call meta-vc9slns,$(name))
diff --git a/common/test.bat b/common/test.bat
index 678e678..74e935d 100644
--- a/common/test.bat
+++ b/common/test.bat
@@ -8,18 +8,37 @@ setlocal
 
 set "tests=__path__(dirs) __path__(thread_dirs)"
 set "confs=__path__(configurations)"
+set "plats=__path__(platforms)"
 set "topdir=__path__(topdir)\.."
+set "failed="
+
+if "_%1_" == "__" (
+  echo no database specified
+  goto usage
+)
 
 goto start
 
+rem
+rem %1 - test directory
+rem %2 - configuration
+rem %3 - platform
+rem %4 - database
+rem
 :run_test
   cd %1
 
-  if exist %2\driver.exe (
-    echo %1\%2
-    call %topdir%\tester.bat tracer %2
+  if "_%3_" == "_Win32_" (
+    set "dir=%2"
+  ) else (
+    set "dir=%3\%2"
+  )
+
+  if exist %dir%\driver.exe (
+    echo %1\%3\%2
+    call %topdir%\tester.bat %4 %2 %3
     if errorlevel 1 (
-      set "failed=%failed% %1\%2"
+      set "failed=%failed% %1\%3\%2"
     )
   )
 
@@ -30,19 +49,32 @@ goto :eof
 
 for %%t in (%tests%) do (
   for %%c in (%confs%) do (
-    call :run_test %%t %%c
+    for %%p in (%plats%) do (
+      call :run_test %%t %%c %%p %1
+    )
   )
 )
 
 if not "_%failed%_" == "__" goto error
 
+echo.
 echo ALL TESTS PASSED
+echo.
 goto end
 
+:usage
+echo.
+echo usage: test.bat database
+echo.
+
 :error
-for %%t in (%failed%) do echo FAILED: %%t
+if not "_%failed%_" == "__" (
+  echo.
+  for %%t in (%failed%) do echo FAILED: %%t
+  echo.
+)
+endlocal
 exit /b 1
-goto end
 
 :end
 endlocal
-- 
cgit v1.1