aboutsummaryrefslogtreecommitdiff
path: root/wlauto/workloads/spec2000/__init__.py
diff options
context:
space:
mode:
authorSebastian Goscik <sebastian.goscik@live.co.uk>2016-03-17 15:23:39 +0000
committerSebastian Goscik <sebastian.goscik@live.co.uk>2016-09-27 11:17:25 +0100
commit1e6763ee9baf4c6f166f3aff2cc38349893f5b4a (patch)
treec5370ad9fe699236ae350a0e1f1a56fd3ebe0de6 /wlauto/workloads/spec2000/__init__.py
parenta4a428c9ae6f5fc44d30d02e0559eed5927b6377 (diff)
pluginloader: Replaced extension loader with WA3 plugin loader
In the process removed modules and boot_strap.py. Also Renamed extensions Plugins. Louie is now monkey patched rather than containing a modified version in external
Diffstat (limited to 'wlauto/workloads/spec2000/__init__.py')
-rw-r--r--wlauto/workloads/spec2000/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/wlauto/workloads/spec2000/__init__.py b/wlauto/workloads/spec2000/__init__.py
index a9ea3aaf..df4e0da4 100644
--- a/wlauto/workloads/spec2000/__init__.py
+++ b/wlauto/workloads/spec2000/__init__.py
@@ -23,7 +23,7 @@ from collections import defaultdict
from wlauto import Workload, Parameter, Alias
from wlauto.exceptions import ConfigError, WorkloadError
-from wlauto.common.resources import ExtensionAsset
+from wlauto.common.resources import PluginAsset
from wlauto.utils.misc import get_cpu_mask
from wlauto.utils.types import boolean, list_or_string
@@ -88,7 +88,7 @@ class Spec2000(Workload):
- "scripts" contains one or more one-liner shell scripts that invoke the benchmark binary with
appropriate command line parameters. The name of the script must be in the format
<benchmark name>[.<variant name>].sh, i.e. name of benchmark, optionally followed by variant
- name, followed by ".sh" extension. If there is more than one script, then all of them must
+ name, followed by ".sh" plugin. If there is more than one script, then all of them must
have a variant; if there is only one script the it should not cotain a variant.
A typical bundle may look like this::
@@ -213,7 +213,7 @@ class Spec2000(Workload):
self.loaded_benchmarks = {}
self.categories = set()
if self.force_extract_assets or len(os.listdir(self.dependencies_directory)) < 2:
- bundle = context.resolver.get(ExtensionAsset(self, self.asset_file))
+ bundle = context.resolver.get(PluginAsset(self, self.asset_file))
with tarfile.open(bundle, 'r:gz') as tf:
tf.extractall(self.dependencies_directory)
for entry in os.listdir(self.dependencies_directory):