[mapguide-commits] r8437 - in trunk/Tools/Vagrant: . centos/x64 centos/x86 ubuntu/x64 ubuntu/x86

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-10-31 06:04:57 -0700 (Fri, 31 Oct 2014)
New Revision: 8437

Modified:
   trunk/Tools/Vagrant/build.bat
   trunk/Tools/Vagrant/centos/x64/Vagrantfile
   trunk/Tools/Vagrant/centos/x86/Vagrantfile
   trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile
   trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
Log:
Vagrant build updates:
 - Set build.bat to build MapGuide in all configurations
 - Update vagrantfiles to also run OGR provider unit tests

Modified: trunk/Tools/Vagrant/build.bat
===================================================================
--- trunk/Tools/Vagrant/build.bat	2014-10-31 12:57:38 UTC (rev 8436)
+++ trunk/Tools/Vagrant/build.bat	2014-10-31 13:04:57 UTC (rev 8437)
@@ -9,12 +9,12 @@
 
 SET BUILD_UBUNTU_32=1
 SET BUILD_UBUNTU_64=1
-SET BUILD_CENTOS_32=0
-SET BUILD_CENTOS_64=0
+SET BUILD_CENTOS_32=1
+SET BUILD_CENTOS_64=1
 SET TEARDOWN_UBUNTU_32=1
 SET TEARDOWN_UBUNTU_64=1
-SET TEARDOWN_CENTOS_32=0
-SET TEARDOWN_CENTOS_64=0
+SET TEARDOWN_CENTOS_32=1
+SET TEARDOWN_CENTOS_64=1
 SET ROOT=%CD%
 SET COMPONENT=
 echo **************** Build Summary *********************

Modified: trunk/Tools/Vagrant/centos/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x64/Vagrantfile	2014-10-31 12:57:38 UTC (rev 8436)
+++ trunk/Tools/Vagrant/centos/x64/Vagrantfile	2014-10-31 13:04:57 UTC (rev 8437)
@@ -271,6 +271,10 @@
     cd $SCRIPT_ROOT/fdo_build_area/Providers/GDAL/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_gdal_unit_test.log
     check_test
+    BUILD_COMPONENT="Unit Test OGR Provider"
+    cd $SCRIPT_ROOT/fdo_build_area/Providers/OGR/Src/UnitTest
+    sudo -E ./UnitTest 2>&1 | tee ~/fdo_ogr_unit_test.log
+    check_test
     BUILD_COMPONENT="Unit Test WMS Provider"
     cd $SCRIPT_ROOT/fdo_build_area/Providers/WMS/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_wms_unit_test.log

Modified: trunk/Tools/Vagrant/centos/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x86/Vagrantfile	2014-10-31 12:57:38 UTC (rev 8436)
+++ trunk/Tools/Vagrant/centos/x86/Vagrantfile	2014-10-31 13:04:57 UTC (rev 8437)
@@ -273,6 +273,10 @@
     cd $SCRIPT_ROOT/fdo_build_area/Providers/GDAL/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_gdal_unit_test.log
     check_test
+    BUILD_COMPONENT="Unit Test OGR Provider"
+    cd $SCRIPT_ROOT/fdo_build_area/Providers/OGR/Src/UnitTest
+    sudo -E ./UnitTest 2>&1 | tee ~/fdo_ogr_unit_test.log
+    check_test
     BUILD_COMPONENT="Unit Test WMS Provider"
     cd $SCRIPT_ROOT/fdo_build_area/Providers/WMS/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_wms_unit_test.log

Modified: trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile	2014-10-31 12:57:38 UTC (rev 8436)
+++ trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile	2014-10-31 13:04:57 UTC (rev 8437)
@@ -324,6 +324,10 @@
     cd $SCRIPT_ROOT/fdo_build_area/Providers/GDAL/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_gdal_unit_test.log
     check_test
+    BUILD_COMPONENT="Unit Test OGR Provider"
+    cd $SCRIPT_ROOT/fdo_build_area/Providers/OGR/Src/UnitTest
+    sudo -E ./UnitTest 2>&1 | tee ~/fdo_ogr_unit_test.log
+    check_test
     BUILD_COMPONENT="Unit Test WMS Provider"
     cd $SCRIPT_ROOT/fdo_build_area/Providers/WMS/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_wms_unit_test.log

Modified: trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile	2014-10-31 12:57:38 UTC (rev 8436)
+++ trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile	2014-10-31 13:04:57 UTC (rev 8437)
@@ -324,6 +324,10 @@
     cd $SCRIPT_ROOT/fdo_build_area/Providers/GDAL/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_gdal_unit_test.log
     check_test
+    BUILD_COMPONENT="Unit Test OGR Provider"
+    cd $SCRIPT_ROOT/fdo_build_area/Providers/OGR/Src/UnitTest
+    sudo -E ./UnitTest 2>&1 | tee ~/fdo_ogr_unit_test.log
+    check_test
     BUILD_COMPONENT="Unit Test WMS Provider"
     cd $SCRIPT_ROOT/fdo_build_area/Providers/WMS/Src/UnitTest
     sudo -E ./UnitTest 2>&1 | tee ~/fdo_wms_unit_test.log