Minor fixes

toolset/benchmark/framework_test.py

@@ -447,8 +447,6 @@ class FrameworkTest:
       profile="$FWROOT/config/benchmark_profile"
 
     # Setup variables for TROOT and IROOT
-    self.troot = self.directory
-    self.iroot = self.install_root
     setup_util.replace_environ(config=profile, 
               command='export TROOT=%s && export IROOT=%s' %
               (self.directory, self.install_root))
@@ -1275,6 +1273,11 @@ class FrameworkTest:
     if benchmarker.install_strategy is 'pertest':
       self.install_root="%s/pertest/%s" % (self.install_root, name)
 
+    # Used in setup.py scripts for consistency with 
+    # the bash environment variables
+    self.troot = self.directory
+    self.iroot = self.install_root
+
     self.__dict__.update(args)
 
     # ensure directory has __init__.py file so that we can use it as a Python package

toolset/benchmark/utils.py

@@ -52,7 +52,7 @@ def gather_tests(include = [], exclude=[], benchmarker=None):
 
   
   # Search in both old and new directories
-  fwroot = os.environ['FWROOT']
+  fwroot = setup_util.get_fwroot() 
   config_files = glob.glob("%s/*/benchmark_config" % fwroot) 
   config_files.extend(glob.glob("%s/frameworks/*/*/benchmark_config" % fwroot))