Merge pull request #7 from tfoleyNV/testing

AppVeyor: Have AppVeyor run our tests.

1 files changed, 24 insertions, 3 deletions

diff --git a/test.bat b/test.bat
index b4398b991..38378a2e3 100644
--- a/test.bat
+++ b/test.bat
@@ -16,19 +16,40 @@ if "%1"=="-release" (
 	shift
 	goto :ARGLOOP
 )
+if "%1"=="-platform" (
+	set SLANG_TEST_PLATFORM=%2
+	shift
+	shift
+	goto :ARGLOOP
+)
+if "%1"=="-configuration" (
+	set SLANG_TEST_CONFIG=%2
+	shift
+	shift
+	goto :ARGLOOP
+)
 
 :: When done with arguments, we'll just fall through here
 
+:: Set root directory to the directory where `test.bat` resides
+:: (which should be the root of the source tree)
 SET "SLANG_TEST_ROOT=%~dp0"
 
+:: If  platform and configuration haven't been set, then set
+:: them to default values.
 IF "%SLANG_TEST_PLATFORM%" == "" ( SET "SLANG_TEST_PLATFORM=x86" )
 IF "%SLANG_TEST_CONFIG%" == "" ( SET "SLANG_TEST_CONFIG=Debug" )
 
-set "SLANG_TEST_BIN_DIR=%SLANG_TEST_ROOT%bin\%SLANG_TEST_PLATFORM%\%SLANG_TEST_CONFIG%\\"
+:: If the user specified a platform of "Win32" swap that to "x86"
+:: to match how we are generating our output directories.
+IF "%SLANG_TEST_PLATFORM%"=="Win32" ( Set "SLANG_TEST_PLATFORM=x86" )
+
+:: Establish the directory where the binaries to be tested reside
+set "SLANG_TEST_BIN_DIR=%SLANG_TEST_ROOT%bin\%SLANG_TEST_PLATFORM%\%SLANG_TEST_CONFIG%\"
 
 :: ensure that any built tools are visible
 SET "PATH=%PATH%;%SLANG_TEST_BIN_DIR%"
 
-:: TODO: ensure that everything is built?
+:: TODO: Maybe we should actually invoke `msbuild` to make sure all the code is up to date?
 
-"%SSLANG_TEST_BIN_DIR%slang-test.exe" --bindir "%SLANG_TEST_BIN_DIR%" %*
+"%SLANG_TEST_BIN_DIR%slang-test.exe" -bindir "%SLANG_TEST_BIN_DIR%\" %*