Accepted PR481 for updates to phpixie framework from dracony.

php-phpixie/deploy/nginx.conf

@@ -61,7 +61,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/ubuntu/FrameworkBenchmarks/php-phpixie/web/;
+        root /home/fb/FrameworkBenchmarks/php-phpixie/web/;
         index  index.php;
 
         location / {

php-phpixie/deploy/php-phpixie

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /php-phpixie/ "/home/ubuntu/FrameworkBenchmarks/php-phpixie/web/"
-  <Directory /home/ubuntu/FrameworkBenchmarks/php-phpixie/web/>
+  Alias /php-phpixie/ "/home/fb/FrameworkBenchmarks/php-phpixie/web/"
+  <Directory /home/fb/FrameworkBenchmarks/php-phpixie/web/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

php-phpixie/vendor/autoload.php

@@ -1,7 +1,7 @@
 <?php
 
-// autoload.php generated by Composer
+// autoload.php @generated by Composer
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit5a349656fca0a335c592c1118b32872c::getLoader();
+return ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239::getLoader();

php-phpixie/vendor/composer/ClassLoader.php

@@ -121,8 +121,8 @@ class ClassLoader
     /**
      * Registers a set of classes, replacing any others previously set.
      *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
+     * @param string       $prefix The classes prefix
+     * @param array|string $paths  The location(s) of the classes
      */
     public function set($prefix, $paths)
     {

php-phpixie/vendor/composer/autoload_classmap.php

@@ -1,6 +1,6 @@
 <?php
 
-// autoload_classmap.php generated by Composer
+// autoload_classmap.php @generated by Composer
 
 $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);

php-phpixie/vendor/composer/autoload_namespaces.php

@@ -1,6 +1,6 @@
 <?php
 
-// autoload_namespaces.php generated by Composer
+// autoload_namespaces.php @generated by Composer
 
 $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);

php-phpixie/vendor/composer/autoload_real.php

@@ -1,8 +1,8 @@
 <?php
 
-// autoload_real.php generated by Composer
+// autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit5a349656fca0a335c592c1118b32872c
+class ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit5a349656fca0a335c592c1118b32872c
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit5a349656fca0a335c592c1118b32872c', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit5a349656fca0a335c592c1118b32872c', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit947ea4decfc38807f5034e43cfc30239', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);

toolset/benchmark/benchmarker.py

@@ -426,23 +426,26 @@ class Benchmarker:
   ############################################################
   def __run_test(self, test):
 
-      if test.os.lower() != self.os.lower() or test.database_os.lower() != self.database_os.lower():
-        # the operating system requirements of this test for the
-        # application server or the database server don't match
-        # our current environment
-        return
- 
       # If the user specified which tests to run, then 
       # we can skip over tests that are not in that list
       if self.test != None and test.name not in self.test:
         return
+
+      if test.os.lower() != self.os.lower() or test.database_os.lower() != self.database_os.lower():
+        # the operating system requirements of this test for the
+        # application server or the database server don't match
+        # our current environment
+        logging.info("OS or Database OS specified in benchmark_config does not match the current environment. Skipping.")
+        return 
       
       # If the test is in the excludes list, we skip it
       if self.exclude != None and test.name in self.exclude:
+        logging.info("Test %s has been added to the excludes list. Skipping.", test.name)
         return
       
       # If the test does not contain an implementation of the current test-type, skip it
       if self.type != 'all' and not test.contains_type(self.type):
+        logging.info("Test type %s does not contain an implementation of the current test-type. Skipping", self.type)
         return
 
       logging.debug("test.os.lower() = %s  test.database_os.lower() = %s",test.os.lower(),test.database_os.lower())