Run only required instances

Due to a mistake, all instances were tested for all configurations. This
commit checks whether a specific instance is actually required for the
tested configuration and skips it if not.
This commit is contained in:
Patrick Lühne 2017-11-23 17:40:19 +01:00
parent 860c5711ef
commit 01222247a2
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF

View File

@ -139,7 +139,7 @@ def nextJob(config):
configurations = benchmarkConfig["configurations"]["configurations"]
instances = benchmarkConfig["instances"]
for instanceSetName, instanceSet in instances.items():
for instanceSetID, instanceSet in instances.items():
for instance in instanceSet:
for configuration in configurations:
filenames = outputFilenames(configuration, instance, config)
@ -147,6 +147,9 @@ def nextJob(config):
errorFile = os.path.join(config["storage"]["local"], filenames["errorFile"])
environmentFile = os.path.join(config["storage"]["local"], filenames["environmentFile"])
if not instanceSetID in configuration["instanceSets"]:
continue
if not os.path.exists(outputFile) or not os.path.exists(errorFile) or not os.path.exists(environmentFile):
return {"configuration": configuration, "instance": instance}