#92: Move the version info inside the benchmark subdirectory

benchmarks/SunSpider/VERSION

@@ -0,0 +1 @@
+1.0.1

benchmarks/asmjs-apps/VERSION

@@ -0,0 +1 @@
+0.20.2

benchmarks/asmjs-ubench/VERSION

@@ -0,0 +1 @@
+0.4.4

benchmarks/dart/VERSION

@@ -0,0 +1 @@
+0.1

benchmarks/kraken/VERSION

@@ -0,0 +1 @@
+1.1

benchmarks/misc-desktop/VERSION

@@ -0,0 +1 @@
+0.1

benchmarks/misc/VERSION

@@ -0,0 +1 @@
+0.7

benchmarks/octane/VERSION

@@ -0,0 +1 @@
+2.0.1

benchmarks/unity-webgl/VERSION

@@ -0,0 +1 @@
+0.1

benchmarks/webaudio/VERSION

@@ -0,0 +1 @@
+0.2

benchmarks/webglsamples/VERSION

@@ -0,0 +1 @@
+0.1

slave/benchmarks_local.py

@@ -8,12 +8,19 @@ import utils
 
 class Benchmark:
     """ timeout is in minutes """
-    def __init__(self, suite, version, page, timeout=2):
+    def __init__(self, suite, folder, page, timeout=2):
+        if folder.endswith("/"):
+            folder = folder[:-1]
+
         self.suite = suite
-        self.version = suite+" "+version
-        self.page = page
+        self.page = "benchmarks/" + folder + "/" + page
         self.timeout = timeout
 
+        with utils.chdir(os.path.join(utils.config.BenchmarkPath, folder)):
+            fp = open("VERSION", 'r')
+            self.version = suite + " " + fp.read().strip("\r\n\r\n \t")
+            fp.close()
+
         host = utils.config.get('main', 'serverUrl')
         if host[-1] != "/":
             host += "/"
@@ -56,7 +63,7 @@ class Benchmark:
 
 class AssortedDOM(Benchmark):
     def __init__(self):
-        Benchmark.__init__(self, "assorteddom", "0.1", "benchmarks/misc-desktop/hosted/assorted/driver.html", 1)
+        Benchmark.__init__(self, "assorteddom", "misc-desktop/", "hosted/assorted/driver.html", 1)
         with utils.FolderChanger(os.path.join(utils.config.BenchmarkPath, "misc-desktop")):
             print subprocess.check_output(["python", "make-hosted.py"])
 
@@ -80,11 +87,11 @@ class AssortedDOM(Benchmark):
 
 class WebGLSamples(Benchmark):
     def __init__(self):
-        Benchmark.__init__(self, "webglsamples", "0.1", "benchmarks/webglsamples/test.html", 1)
+        Benchmark.__init__(self, "webglsamples", "webglsamples/", "test.html", 1)
 
 class WebAudio(Benchmark):
     def __init__(self):
-        Benchmark.__init__(self, "webaudio", "0.2", "benchmarks/webaudio/index.html", 2)
+        Benchmark.__init__(self, "webaudio", "webaudio/", "index.html", 2)
 
     def processResults(self, results):
         ret = []
@@ -97,7 +104,7 @@ class WebAudio(Benchmark):
 
 class UnityWebGL(Benchmark):
     def __init__(self):
-        Benchmark.__init__(self, "unity-webgl", "0.1", "benchmarks/unity-webgl/index.html",  6)
+        Benchmark.__init__(self, "unity-webgl", "unity-webgl/", "index.html",  6)
 
     def processResults(self, results):
         ret = []

slave/benchmarks_shell.py

@@ -11,11 +11,18 @@ import submitter
 import utils
 
 class Benchmark(object):
-    def __init__(self, suite, version, folder):
+    def __init__(self, suite, folder):
+        if folder.endswith("/"):
+            folder = folder[:-1]
+
         self.suite = suite
-        self.version = suite+" "+version
         self.folder = folder
 
+        with utils.chdir(os.path.join(utils.config.BenchmarkPath, self.folder)):
+            fp = open("VERSION", 'r')
+            self.version = suite + " " + fp.read().strip("\r\n\r\n \t")
+            fp.close()
+
     def run(self, engine, submit):
         with utils.chdir(os.path.join(utils.config.BenchmarkPath, self.folder)):
             return self._run(engine, submit)
@@ -36,7 +43,7 @@ class Benchmark(object):
 
 class Octane(Benchmark):
     def __init__(self):
-        super(Octane, self).__init__('octane', '2.0.1', 'octane')
+        super(Octane, self).__init__('octane', 'octane/')
 
     def benchmark(self, shell, env, args):
         full_args = [shell]
@@ -64,8 +71,8 @@ class Octane(Benchmark):
         return tests
 
 class SunSpiderBased(Benchmark):
-    def __init__(self, suite, version, folder, runs):
-        super(SunSpiderBased, self).__init__(suite, version, folder)
+    def __init__(self, suite, folder, runs):
+        super(SunSpiderBased, self).__init__(suite, folder)
         self.runs = runs
 
     def benchmark(self, shell, env, args):
@@ -105,15 +112,15 @@ class SunSpiderBased(Benchmark):
 
 class SunSpider(SunSpiderBased):
     def __init__(self):
-        super(SunSpider, self).__init__('ss', '1.0.1', 'SunSpider', 20)
+        super(SunSpider, self).__init__('ss', 'SunSpider/', 20)
 
 class Kraken(SunSpiderBased):
     def __init__(self):
-        super(Kraken, self).__init__('kraken', '1.1', 'kraken', 5)
+        super(Kraken, self).__init__('kraken', 'kraken/', 5)
 
 class Assorted(SunSpiderBased):
     def __init__(self):
-        super(Assorted, self).__init__('misc', '0.6', 'misc', 3)
+        super(Assorted, self).__init__('misc', 'misc/', 3)
 
 class AsmJSBased(Benchmark):
     def __init__(self, suite, version, folder):
@@ -158,15 +165,15 @@ class AsmJSBased(Benchmark):
 
 class AsmJSMicro(AsmJSBased):
     def __init__(self):
-        super(AsmJSMicro, self).__init__('asmjs-ubench', '0.4.4', 'asmjs-ubench')
+        super(AsmJSMicro, self).__init__('asmjs-ubench', 'asmjs-ubench/')
 
 class AsmJSApps(AsmJSBased):
     def __init__(self):
-        super(AsmJSApps, self).__init__('asmjs-apps', '0.2', 'asmjs-apps')
+        super(AsmJSApps, self).__init__('asmjs-apps', 'asmjs-apps/')
 
 class Dart(Benchmark):
     def __init__(self):
-        super(Dart, self).__init__('dart', '0.1', 'dart')
+        super(Dart, self).__init__('dart', 'dart/')
 
     def benchmark(self, shell, env, args):
         full_args = [shell]