[mapguide-commits] r8498 - branches/2.6/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-01-11 04:47:22 -0800 (Sun, 11 Jan 2015)
New Revision: 8498

Modified:
   branches/2.6/MgDev/run_tests.bat
   branches/2.6/MgDev/setenvironment.bat
Log:
Undo unintended side-effects from previous merge

Modified: branches/2.6/MgDev/run_tests.bat
===================================================================
--- branches/2.6/MgDev/run_tests.bat	2015-01-11 12:38:10 UTC (rev 8497)
+++ branches/2.6/MgDev/run_tests.bat	2015-01-11 12:47:22 UTC (rev 8498)
@@ -11,16 +11,15 @@
 SET SERVER_ADDR=localhost
 SET WEBCONFIGINI=%CD%\UnitTest\webconfig.ini
 SET SERVER_PORT=8018
-SET PATH=D:\mg-2.6\MgDev\Release\Web\Php;%PATH%;
 REM SET WEBCONFIGINI=C:\Program Files\OSGeo\MapGuide\Web\www\webconfig.ini
 REM SET SERVER_PORT=80
 SET PHP_TEST_CWD=%CD%\Web\src\mapagent
-SET PHP_EXT_DIR=D:\mg-2.6\MgDev\Release\Web\Php\ext
+SET PHP_EXT_DIR=C:\Program Files\OSGeo\MapGuide\Web\Php\ext
 
 SET START_MGSERVER=1
 SET START_WEBSERVER=1
-SET RUN_SERVER_TESTS=0
-SET RUN_PHP_TESTS=0
+SET RUN_SERVER_TESTS=1
+SET RUN_PHP_TESTS=1
 SET RUN_DOTNET_TESTS=1
 
 SET RETURN_CODE=0

Modified: branches/2.6/MgDev/setenvironment.bat
===================================================================
--- branches/2.6/MgDev/setenvironment.bat	2015-01-11 12:38:10 UTC (rev 8497)
+++ branches/2.6/MgDev/setenvironment.bat	2015-01-11 12:47:22 UTC (rev 8498)
@@ -83,7 +83,7 @@
 rem running
 rem ==================================================
 
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files (x86\Java\jdk1.6.0_33
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_31
 IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
 IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\GnuWin32\bin
 IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip