Removed the need for setup_file in configs (#3299)

frameworks/Java/gemini/benchmark_config.json

@@ -3,7 +3,6 @@
   "tests": [
     {
       "default": {
-        "setup_file": "gemini.dockerfile",
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "port": 8080,
@@ -23,7 +22,6 @@
         "versus": "servlet"
       },
       "mysql": {
-        "setup_file": "gemini-mysql.dockerfile",
         "db_url": "/db",
         "query_url": "/query?queries=",
         "cached_query_url": "/cached_query?queries=",
@@ -46,7 +44,6 @@
         "versus": "servlet"
       },
       "postgres": {
-        "setup_file": "gemini-postgres.dockerfile",
         "db_url": "/db",
         "query_url": "/query?queries=",
         "cached_query_url": "/cached_query?queries=",

toolset/benchmark/framework_test.py

@@ -259,7 +259,7 @@ class FrameworkTest:
     ##########################
     # Build the Docker images
     ##########################
-    test_docker_file = os.path.join(self.directory, self.setup_file)
+    test_docker_file = os.path.join(self.directory, "%s.dockerfile" % self.name)
     deps = list(reversed(gather_docker_dependencies( test_docker_file )))
 
     docker_dir = os.path.join(setup_util.get_fwroot(), "toolset", "setup", "linux", "docker")