|
@@ -447,8 +447,10 @@ class FrameworkTest:
|
|
|
logging.warning("Framework %s does not have a bash_profile" % self.name)
|
|
|
profile="$FWROOT/config/benchmark_profile"
|
|
|
|
|
|
- set_iroot="export IROOT=%s" % self.install_root
|
|
|
- setup_util.replace_environ(config=profile, command=set_iroot)
|
|
|
+ test_rel_dir = setup_util.path_relative_to_root(self.directory)
|
|
|
+ setup_util.replace_environ(config=profile,
|
|
|
+ command='export TROOT=$FWROOT%s && export IROOT=%s' %
|
|
|
+ (test_rel_dir, self.install_root))
|
|
|
|
|
|
return self.setup_module.start(self.benchmarker, out, err)
|
|
|
############################################################
|
|
@@ -460,6 +462,17 @@ class FrameworkTest:
|
|
|
# Stops the test using it's setup file
|
|
|
############################################################
|
|
|
def stop(self, out, err):
|
|
|
+ # Load profile for this installation
|
|
|
+ profile="%s/bash_profile.sh" % self.directory
|
|
|
+ if not os.path.exists(profile):
|
|
|
+ logging.warning("Framework %s does not have a bash_profile" % self.name)
|
|
|
+ profile="$FWROOT/config/benchmark_profile"
|
|
|
+
|
|
|
+ test_rel_dir = setup_util.path_relative_to_root(self.directory)
|
|
|
+ setup_util.replace_environ(config=profile,
|
|
|
+ command='export TROOT=$FWROOT%s && export IROOT=%s' %
|
|
|
+ (test_rel_dir, self.install_root))
|
|
|
+
|
|
|
return self.setup_module.stop(out, err)
|
|
|
############################################################
|
|
|
# End stop
|