diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-13 17:52:07 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-13 17:52:07 (GMT) |
| commit | a22c9ab9c1a72bee6802dc8ada771930253f140b (patch) | |
| tree | 4cf34dc98988d5d78c13d471d24691e065a8e5ed /contrib/ctest | |
| parent | 5342ef51367116726454ebdbd4bc27f0de3354b2 (diff) | |
| download | uscxml-a22c9ab9c1a72bee6802dc8ada771930253f140b.zip uscxml-a22c9ab9c1a72bee6802dc8ada771930253f140b.tar.gz uscxml-a22c9ab9c1a72bee6802dc8ada771930253f140b.tar.bz2 | |
Some fixes to run-tests.vbs
Diffstat (limited to 'contrib/ctest')
| -rw-r--r-- | contrib/ctest/hosts/epikur-win7-64.ctest | 7 | ||||
| -rw-r--r-- | contrib/ctest/run-tests.vbs | 21 |
2 files changed, 20 insertions, 8 deletions
diff --git a/contrib/ctest/hosts/epikur-win7-64.ctest b/contrib/ctest/hosts/epikur-win7-64.ctest new file mode 100644 index 0000000..24c8dca --- /dev/null +++ b/contrib/ctest/hosts/epikur-win7-64.ctest @@ -0,0 +1,7 @@ +set(CTEST_CMAKE_GENERATOR "NMake Makefiles") +set(CTEST_SITE "epikur-win7-64") +set(CTEST_BUILD_CONFIGURATION "Debug") + +set(CTEST_BUILD_NAME "win7-x86_64 msvc generic") +include("tests/generic.ctest") +include("common.ctest.inc") diff --git a/contrib/ctest/run-tests.vbs b/contrib/ctest/run-tests.vbs index 9298fe0..66e187b 100644 --- a/contrib/ctest/run-tests.vbs +++ b/contrib/ctest/run-tests.vbs @@ -29,6 +29,10 @@ If VCVARSALL = "%VCVARSALL%" Then VCVARSALL = "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" End If if (NOT fso.FileExists(VCVARSALL)) Then + VCVARSALL = "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" +End If + +if (NOT fso.FileExists(VCVARSALL)) Then MsgBox("Please export %VCVARSALL% as the command to get a build environment for msvc.") WScript.Quit End If @@ -39,15 +43,15 @@ If CTEST_SUBMIT_TYPE = "%CTEST_SUBMIT_TYPE%" Then procEnv("CTEST_SUBMIT_TYPE") = CTEST_SUBMIT_TYPE End If -MILES_SOURCE_DIR = shell.ExpandEnvironmentStrings("%MILES_SOURCE_DIR%") -If MILES_SOURCE_DIR = "%MILES_SOURCE_DIR%" Then - MILES_SOURCE_DIR = fso.GetParentFolderName(fso.GetParentFolderName(TEST_DIR)) - procEnv("MILES_SOURCE_DIR") = MILES_SOURCE_DIR +USCXML_SOURCE_DIR = shell.ExpandEnvironmentStrings("%USCXML_SOURCE_DIR%") +If USCXML_SOURCE_DIR = "%USCXML_SOURCE_DIR%" Then + USCXML_SOURCE_DIR = fso.GetParentFolderName(fso.GetParentFolderName(TEST_DIR)) + procEnv("USCXML_SOURCE_DIR") = USCXML_SOURCE_DIR End If -MILES_SOURCE_DIR = shell.ExpandEnvironmentStrings("%MILES_SOURCE_DIR%") -if (NOT fso.FileExists(MILES_SOURCE_DIR + "\CMakeLists.txt")) Then - MsgBox "Could not find uMundo Source for " + ME_NAME +USCXML_SOURCE_DIR = shell.ExpandEnvironmentStrings("%USCXML_SOURCE_DIR%") +if (NOT fso.FileExists(USCXML_SOURCE_DIR + "\CMakeLists.txt")) Then + MsgBox "Could not find uSCXML Source for " + ME_NAME WScript.Quit End If @@ -66,7 +70,7 @@ Set buildLock = fso.OpenTextFile(TESTFILE, 8, True) ' Check github for updates and quit when nothing's new if (CTEST_SUBMIT_TYPE = "Continuous") Then - shell.CurrentDirectory = MILES_SOURCE_DIR + shell.CurrentDirectory = USCXML_SOURCE_DIR Set oExec = shell.Exec("git pull") GIT_SYNC = oExec.StdOut.ReadLine if (GIT_SYNC = "Already up-to-date.") Then @@ -81,3 +85,4 @@ Do While exec.Status = 0 WScript.StdOut.Write(exec.StdOut.ReadLine() & vbCRLF) ' WScript.StdErr.Write(exec.StdErr.ReadLine()) Loop +WScript.Sleep 1000000
\ No newline at end of file |