Resolved conflicts with upstream cleanup-metadata.

frameworks/Java/rapidoid/benchmark_config.json

@@ -1,26 +1,25 @@
 {
   "framework": "rapidoid",
-  "tests": [
-    {
-      "default": {
-        "setup_file": "setup-low-level",
-        "json_url": "/json",
-        "plaintext_url": "/plaintext",
-        "port": 8080,
-        "approach": "Realistic",
-        "classification": "Platform",
-        "database": "None",
-        "framework": "rapidoid-http-fast",
-        "language": "Java",
-        "orm": "Raw",
-        "platform": "None",
-        "webserver": "None",
-        "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "rapidoid-http-fast",
-        "notes": "",
-        "versus": ""
-      }
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/json",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Stripped",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "None",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "None",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Rapidoid",
+      "notes": "",
+      "versus": "rapidoid"
     }
-  ]
+  }]
 }

toolset/benchmark/benchmarker.py

@@ -610,6 +610,14 @@ class Benchmarker:
           pass
         passed_verify = test.verify_urls(verificationPath)
 
+        ##########################
+        # Nuke /tmp
+        ##########################
+        try:
+          subprocess.check_call('sudo rm -rf /tmp/*', shell=True, stderr=out, stdout=out)
+        except Exception:
+          out.write(header("Error: Could not empty /tmp"))
+
         ##########################
         # Benchmark this test
         ##########################

toolset/benchmark/framework_test.py

@@ -28,7 +28,7 @@ from datetime import datetime
 from datetime import timedelta
 
 class FrameworkTest:
-  headers_template = "-H 'Host: localhost' -H '{accept}' -H 'Connection: keep-alive'"
+  headers_template = "-H 'Host: localhost' -H 'Accept: {accept}' -H 'Connection: keep-alive'"
  
   # Used for test types that require no pipelining or query string params.
   concurrency_template = """
@@ -492,8 +492,6 @@ class FrameworkTest:
         pprint(results)
 
         self.benchmarker.report_benchmark_results(framework=self, test=test_type, results=results['results'])
-        rmtmp = "find /tmp -maxdepth 1 -name \"*\" -print0 | xargs -0 sudo -u %s rm" % (self.benchmarker.runner_user)
-        subprocess.Popen(rmtmp, shell=True, cwd=self.fwroot, executable='/bin/bash')
         out.write( "Complete\n" )
         out.flush()