Browse Source

Merge pull request #1367 from LadyMozzarella/i1095-add-json-extension-to-benchmark_config

Toolset: Move to benchmark_config.json
Hamilton Turner 10 years ago
parent
commit
be2b71a02e
100 changed files with 4 additions and 4 deletions
  1. 0 0
      frameworks/C++/ULib/benchmark_config.json
  2. 0 0
      frameworks/C++/cpoll_cppsp/benchmark_config.json
  3. 0 0
      frameworks/C++/silicon/benchmark_config.json
  4. 0 0
      frameworks/C++/treefrog/benchmark_config.json
  5. 0 0
      frameworks/C++/wt/benchmark_config.json
  6. 0 0
      frameworks/C/duda/benchmark_config.json
  7. 0 0
      frameworks/C/haywire/benchmark_config.json
  8. 0 0
      frameworks/C/lwan/benchmark_config.json
  9. 0 0
      frameworks/C/onion/benchmark_config.json
  10. 0 0
      frameworks/CSharp/HttpListener/benchmark_config.json
  11. 0 0
      frameworks/CSharp/aspnet-stripped/benchmark_config.json
  12. 0 0
      frameworks/CSharp/aspnet/benchmark_config.json
  13. 0 0
      frameworks/CSharp/evhttp-sharp/benchmark_config.json
  14. 0 0
      frameworks/CSharp/nancy/benchmark_config.json
  15. 0 0
      frameworks/CSharp/servicestack/benchmark_config.json
  16. 0 0
      frameworks/Clojure/compojure/benchmark_config.json
  17. 0 0
      frameworks/Clojure/http-kit/benchmark_config.json
  18. 0 0
      frameworks/Clojure/luminus/benchmark_config.json
  19. 0 0
      frameworks/Dart/dart-redstone/benchmark_config.json
  20. 0 0
      frameworks/Dart/dart-start/benchmark_config.json
  21. 0 0
      frameworks/Dart/dart-stream/benchmark_config.json
  22. 0 0
      frameworks/Dart/dart/benchmark_config.json
  23. 0 0
      frameworks/Elixir/WeberFramework/benchmark_config.json
  24. 0 0
      frameworks/Erlang/cowboy/benchmark_config.json
  25. 0 0
      frameworks/Erlang/elli/benchmark_config.json
  26. 0 0
      frameworks/Go/beego/benchmark_config.json
  27. 0 0
      frameworks/Go/falcore/benchmark_config.json
  28. 0 0
      frameworks/Go/gin/benchmark_config.json
  29. 0 0
      frameworks/Go/go/benchmark_config.json
  30. 0 0
      frameworks/Go/revel-jet/benchmark_config.json
  31. 0 0
      frameworks/Go/revel-qbs/benchmark_config.json
  32. 0 0
      frameworks/Go/revel/benchmark_config.json
  33. 0 0
      frameworks/Go/webgo/benchmark_config.json
  34. 0 0
      frameworks/Groovy/grails/benchmark_config.json
  35. 0 0
      frameworks/Haskell/snap/benchmark_config.json
  36. 0 0
      frameworks/Haskell/wai/benchmark_config.json
  37. 0 0
      frameworks/Haskell/yesod/benchmark_config.json
  38. 0 0
      frameworks/Java/activeweb/benchmark_config.json
  39. 0 0
      frameworks/Java/curacao/benchmark_config.json
  40. 0 0
      frameworks/Java/dropwizard-mongodb/benchmark_config.json
  41. 0 0
      frameworks/Java/dropwizard/benchmark_config.json
  42. 0 0
      frameworks/Java/gemini/benchmark_config.json
  43. 0 0
      frameworks/Java/grizzly-bm/benchmark_config.json
  44. 0 0
      frameworks/Java/grizzly-jersey/benchmark_config.json
  45. 0 0
      frameworks/Java/jetty-servlet/benchmark_config.json
  46. 0 0
      frameworks/Java/netty/benchmark_config.json
  47. 0 0
      frameworks/Java/ninja-standalone/benchmark_config.json
  48. 0 0
      frameworks/Java/play1/benchmark_config.json
  49. 0 0
      frameworks/Java/play1siena/benchmark_config.json
  50. 1 1
      frameworks/Java/play1siena/setup.sh
  51. 1 1
      frameworks/Java/play2-java/README.md
  52. 0 0
      frameworks/Java/play2-java/benchmark_config.json
  53. 2 2
      frameworks/Java/play2-java/generate_config.py
  54. 0 0
      frameworks/Java/restexpress/benchmark_config.json
  55. 0 0
      frameworks/Java/sabina/benchmark_config.json
  56. 0 0
      frameworks/Java/servlet/benchmark_config.json
  57. 0 0
      frameworks/Java/servlet3-cass/benchmark_config.json
  58. 0 0
      frameworks/Java/spark/benchmark_config.json
  59. 0 0
      frameworks/Java/spring/benchmark_config.json
  60. 0 0
      frameworks/Java/tapestry/benchmark_config.json
  61. 0 0
      frameworks/Java/undertow-edge/benchmark_config.json
  62. 0 0
      frameworks/Java/undertow/benchmark_config.json
  63. 0 0
      frameworks/Java/vertx/benchmark_config.json
  64. 0 0
      frameworks/Java/wicket/benchmark_config.json
  65. 0 0
      frameworks/Java/wildfly-ee7/benchmark_config.json
  66. 0 0
      frameworks/JavaScript/express/benchmark_config.json
  67. 0 0
      frameworks/JavaScript/hapi/benchmark_config.json
  68. 0 0
      frameworks/JavaScript/nodejs/benchmark_config.json
  69. 0 0
      frameworks/JavaScript/ringojs-convenient/benchmark_config.json
  70. 0 0
      frameworks/JavaScript/ringojs/benchmark_config.json
  71. 0 0
      frameworks/Lua/lapis/benchmark_config.json
  72. 0 0
      frameworks/Lua/openresty/benchmark_config.json
  73. 0 0
      frameworks/Nim/jester/benchmark_config.json
  74. 0 0
      frameworks/Nim/nawak/benchmark_config.json
  75. 0 0
      frameworks/PHP/Yii2/benchmark_config.json
  76. 0 0
      frameworks/PHP/cakephp/benchmark_config.json
  77. 0 0
      frameworks/PHP/codeigniter/benchmark_config.json
  78. 0 0
      frameworks/PHP/fuel/benchmark_config.json
  79. 0 0
      frameworks/PHP/hhvm/benchmark_config.json
  80. 0 0
      frameworks/PHP/kohana/benchmark_config.json
  81. 0 0
      frameworks/PHP/lithium/benchmark_config.json
  82. 0 0
      frameworks/PHP/php-fatfree/benchmark_config.json
  83. 0 0
      frameworks/PHP/php-laravel/benchmark_config.json
  84. 0 0
      frameworks/PHP/php-micromvc/benchmark_config.json
  85. 0 0
      frameworks/PHP/php-phalcon-micro/benchmark_config.json
  86. 0 0
      frameworks/PHP/php-phalcon/benchmark_config.json
  87. 0 0
      frameworks/PHP/php-phpixie/benchmark_config.json
  88. 0 0
      frameworks/PHP/php-pimf/benchmark_config.json
  89. 0 0
      frameworks/PHP/php-silex-orm/benchmark_config.json
  90. 0 0
      frameworks/PHP/php-silex/benchmark_config.json
  91. 0 0
      frameworks/PHP/php-slim/benchmark_config.json
  92. 0 0
      frameworks/PHP/php-yaf/benchmark_config.json
  93. 0 0
      frameworks/PHP/php-zend-framework/benchmark_config.json
  94. 0 0
      frameworks/PHP/php-zend-framework1/benchmark_config.json
  95. 0 0
      frameworks/PHP/php/benchmark_config.json
  96. 0 0
      frameworks/PHP/phreeze/benchmark_config.json
  97. 0 0
      frameworks/PHP/symfony2-stripped/benchmark_config.json
  98. 0 0
      frameworks/PHP/symfony2/benchmark_config.json
  99. 0 0
      frameworks/Perl/dancer/benchmark_config.json
  100. 0 0
      frameworks/Perl/kelp/benchmark_config.json

+ 0 - 0
frameworks/C++/ULib/benchmark_config → frameworks/C++/ULib/benchmark_config.json


+ 0 - 0
frameworks/C++/cpoll_cppsp/benchmark_config → frameworks/C++/cpoll_cppsp/benchmark_config.json


+ 0 - 0
frameworks/C++/silicon/benchmark_config → frameworks/C++/silicon/benchmark_config.json


+ 0 - 0
frameworks/C++/treefrog/benchmark_config → frameworks/C++/treefrog/benchmark_config.json


+ 0 - 0
frameworks/C++/wt/benchmark_config → frameworks/C++/wt/benchmark_config.json


+ 0 - 0
frameworks/C/duda/benchmark_config → frameworks/C/duda/benchmark_config.json


+ 0 - 0
frameworks/C/haywire/benchmark_config → frameworks/C/haywire/benchmark_config.json


+ 0 - 0
frameworks/C/lwan/benchmark_config → frameworks/C/lwan/benchmark_config.json


+ 0 - 0
frameworks/C/onion/benchmark_config → frameworks/C/onion/benchmark_config.json


+ 0 - 0
frameworks/CSharp/HttpListener/benchmark_config → frameworks/CSharp/HttpListener/benchmark_config.json


+ 0 - 0
frameworks/CSharp/aspnet-stripped/benchmark_config → frameworks/CSharp/aspnet-stripped/benchmark_config.json


+ 0 - 0
frameworks/CSharp/aspnet/benchmark_config → frameworks/CSharp/aspnet/benchmark_config.json


+ 0 - 0
frameworks/CSharp/evhttp-sharp/benchmark_config → frameworks/CSharp/evhttp-sharp/benchmark_config.json


+ 0 - 0
frameworks/CSharp/nancy/benchmark_config → frameworks/CSharp/nancy/benchmark_config.json


+ 0 - 0
frameworks/CSharp/servicestack/benchmark_config → frameworks/CSharp/servicestack/benchmark_config.json


+ 0 - 0
frameworks/Clojure/compojure/benchmark_config → frameworks/Clojure/compojure/benchmark_config.json


+ 0 - 0
frameworks/Clojure/http-kit/benchmark_config → frameworks/Clojure/http-kit/benchmark_config.json


+ 0 - 0
frameworks/Clojure/luminus/benchmark_config → frameworks/Clojure/luminus/benchmark_config.json


+ 0 - 0
frameworks/Dart/dart-redstone/benchmark_config → frameworks/Dart/dart-redstone/benchmark_config.json


+ 0 - 0
frameworks/Dart/dart-start/benchmark_config → frameworks/Dart/dart-start/benchmark_config.json


+ 0 - 0
frameworks/Dart/dart-stream/benchmark_config → frameworks/Dart/dart-stream/benchmark_config.json


+ 0 - 0
frameworks/Dart/dart/benchmark_config → frameworks/Dart/dart/benchmark_config.json


+ 0 - 0
frameworks/Elixir/WeberFramework/benchmark_config → frameworks/Elixir/WeberFramework/benchmark_config.json


+ 0 - 0
frameworks/Erlang/cowboy/benchmark_config → frameworks/Erlang/cowboy/benchmark_config.json


+ 0 - 0
frameworks/Erlang/elli/benchmark_config → frameworks/Erlang/elli/benchmark_config.json


+ 0 - 0
frameworks/Go/beego/benchmark_config → frameworks/Go/beego/benchmark_config.json


+ 0 - 0
frameworks/Go/falcore/benchmark_config → frameworks/Go/falcore/benchmark_config.json


+ 0 - 0
frameworks/Go/gin/benchmark_config → frameworks/Go/gin/benchmark_config.json


+ 0 - 0
frameworks/Go/go/benchmark_config → frameworks/Go/go/benchmark_config.json


+ 0 - 0
frameworks/Go/revel-jet/benchmark_config → frameworks/Go/revel-jet/benchmark_config.json


+ 0 - 0
frameworks/Go/revel-qbs/benchmark_config → frameworks/Go/revel-qbs/benchmark_config.json


+ 0 - 0
frameworks/Go/revel/benchmark_config → frameworks/Go/revel/benchmark_config.json


+ 0 - 0
frameworks/Go/webgo/benchmark_config → frameworks/Go/webgo/benchmark_config.json


+ 0 - 0
frameworks/Groovy/grails/benchmark_config → frameworks/Groovy/grails/benchmark_config.json


+ 0 - 0
frameworks/Haskell/snap/benchmark_config → frameworks/Haskell/snap/benchmark_config.json


+ 0 - 0
frameworks/Haskell/wai/benchmark_config → frameworks/Haskell/wai/benchmark_config.json


+ 0 - 0
frameworks/Haskell/yesod/benchmark_config → frameworks/Haskell/yesod/benchmark_config.json


+ 0 - 0
frameworks/Java/activeweb/benchmark_config → frameworks/Java/activeweb/benchmark_config.json


+ 0 - 0
frameworks/Java/curacao/benchmark_config → frameworks/Java/curacao/benchmark_config.json


+ 0 - 0
frameworks/Java/dropwizard-mongodb/benchmark_config → frameworks/Java/dropwizard-mongodb/benchmark_config.json


+ 0 - 0
frameworks/Java/dropwizard/benchmark_config → frameworks/Java/dropwizard/benchmark_config.json


+ 0 - 0
frameworks/Java/gemini/benchmark_config → frameworks/Java/gemini/benchmark_config.json


+ 0 - 0
frameworks/Java/grizzly-bm/benchmark_config → frameworks/Java/grizzly-bm/benchmark_config.json


+ 0 - 0
frameworks/Java/grizzly-jersey/benchmark_config → frameworks/Java/grizzly-jersey/benchmark_config.json


+ 0 - 0
frameworks/Java/jetty-servlet/benchmark_config → frameworks/Java/jetty-servlet/benchmark_config.json


+ 0 - 0
frameworks/Java/netty/benchmark_config → frameworks/Java/netty/benchmark_config.json


+ 0 - 0
frameworks/Java/ninja-standalone/benchmark_config → frameworks/Java/ninja-standalone/benchmark_config.json


+ 0 - 0
frameworks/Java/play1/benchmark_config → frameworks/Java/play1/benchmark_config.json


+ 0 - 0
frameworks/Java/play1siena/benchmark_config → frameworks/Java/play1siena/benchmark_config.json


+ 1 - 1
frameworks/Java/play1siena/setup.sh

@@ -5,5 +5,5 @@ export RESIN_HOME=${IROOT}/resin-4.0.41
 sed -i 's|jdbc:mysql://.*:3306|jdbc:mysql://'"${DBHOST}"':3306|g' conf/application.conf
 
 rm -rf $RESIN_HOME/webapps/*
-$PLAY1_HOME/play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config
+$PLAY1_HOME/play war -o $RESIN_HOME/webapps/play1 --exclude benchmark_config.json
 $RESIN_HOME/bin/resinctl start

+ 1 - 1
frameworks/Java/play2-java/README.md

@@ -2,4 +2,4 @@
 
 1. Add new test applications in subdirectories named either `play2-java` or `play2-java-orm`.
 2. Edit `frameworks/Java/play2-java/generate_config.py` and add configuration for the new test applications.
-3. Run `python frameworks/Java/play2-java/generate_config.py` to generate a new `benchmark_config` file and to generate a `setup_*.py` file for your test application.
+3. Run `python frameworks/Java/play2-java/generate_config.py` to generate a new `benchmark_config.json` file and to generate a `setup_*.py` file for your test application.

+ 0 - 0
frameworks/Java/play2-java/benchmark_config → frameworks/Java/play2-java/benchmark_config.json


+ 2 - 2
frameworks/Java/play2-java/generate_config.py

@@ -2,7 +2,7 @@
 
 import collections, json, os, textwrap
 
-# This script generates the benchmark_config and setup_*.py files.
+# This script generates the benchmark_config.json and setup_*.py files.
 # To add new tests, modify the `configurations` and `test_urls` tables.
 
 # Each line corresponds to a test application.
@@ -85,7 +85,7 @@ for lang, orm, opsyses, tests in configurations:
       lang_test_configs[lang][test_name] = test_config_json
 
 for lang, _ in langs.iteritems():
-  benchmark_config_path = os.path.join(pathForLang(lang), 'benchmark_config')
+  benchmark_config_path = os.path.join(pathForLang(lang), 'benchmark_config.json')
   print 'Generating', benchmark_config_path
   with open(benchmark_config_path, 'w') as f:
     json_str = json.dumps({

+ 0 - 0
frameworks/Java/restexpress/benchmark_config → frameworks/Java/restexpress/benchmark_config.json


+ 0 - 0
frameworks/Java/sabina/benchmark_config → frameworks/Java/sabina/benchmark_config.json


+ 0 - 0
frameworks/Java/servlet/benchmark_config → frameworks/Java/servlet/benchmark_config.json


+ 0 - 0
frameworks/Java/servlet3-cass/benchmark_config → frameworks/Java/servlet3-cass/benchmark_config.json


+ 0 - 0
frameworks/Java/spark/benchmark_config → frameworks/Java/spark/benchmark_config.json


+ 0 - 0
frameworks/Java/spring/benchmark_config → frameworks/Java/spring/benchmark_config.json


+ 0 - 0
frameworks/Java/tapestry/benchmark_config → frameworks/Java/tapestry/benchmark_config.json


+ 0 - 0
frameworks/Java/undertow-edge/benchmark_config → frameworks/Java/undertow-edge/benchmark_config.json


+ 0 - 0
frameworks/Java/undertow/benchmark_config → frameworks/Java/undertow/benchmark_config.json


+ 0 - 0
frameworks/Java/vertx/benchmark_config → frameworks/Java/vertx/benchmark_config.json


+ 0 - 0
frameworks/Java/wicket/benchmark_config → frameworks/Java/wicket/benchmark_config.json


+ 0 - 0
frameworks/Java/wildfly-ee7/benchmark_config → frameworks/Java/wildfly-ee7/benchmark_config.json


+ 0 - 0
frameworks/JavaScript/express/benchmark_config → frameworks/JavaScript/express/benchmark_config.json


+ 0 - 0
frameworks/JavaScript/hapi/benchmark_config → frameworks/JavaScript/hapi/benchmark_config.json


+ 0 - 0
frameworks/JavaScript/nodejs/benchmark_config → frameworks/JavaScript/nodejs/benchmark_config.json


+ 0 - 0
frameworks/JavaScript/ringojs-convenient/benchmark_config → frameworks/JavaScript/ringojs-convenient/benchmark_config.json


+ 0 - 0
frameworks/JavaScript/ringojs/benchmark_config → frameworks/JavaScript/ringojs/benchmark_config.json


+ 0 - 0
frameworks/Lua/lapis/benchmark_config → frameworks/Lua/lapis/benchmark_config.json


+ 0 - 0
frameworks/Lua/openresty/benchmark_config → frameworks/Lua/openresty/benchmark_config.json


+ 0 - 0
frameworks/Nim/jester/benchmark_config → frameworks/Nim/jester/benchmark_config.json


+ 0 - 0
frameworks/Nim/nawak/benchmark_config → frameworks/Nim/nawak/benchmark_config.json


+ 0 - 0
frameworks/PHP/Yii2/benchmark_config → frameworks/PHP/Yii2/benchmark_config.json


+ 0 - 0
frameworks/PHP/cakephp/benchmark_config → frameworks/PHP/cakephp/benchmark_config.json


+ 0 - 0
frameworks/PHP/codeigniter/benchmark_config → frameworks/PHP/codeigniter/benchmark_config.json


+ 0 - 0
frameworks/PHP/fuel/benchmark_config → frameworks/PHP/fuel/benchmark_config.json


+ 0 - 0
frameworks/PHP/hhvm/benchmark_config → frameworks/PHP/hhvm/benchmark_config.json


+ 0 - 0
frameworks/PHP/kohana/benchmark_config → frameworks/PHP/kohana/benchmark_config.json


+ 0 - 0
frameworks/PHP/lithium/benchmark_config → frameworks/PHP/lithium/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-fatfree/benchmark_config → frameworks/PHP/php-fatfree/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-laravel/benchmark_config → frameworks/PHP/php-laravel/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-micromvc/benchmark_config → frameworks/PHP/php-micromvc/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-phalcon-micro/benchmark_config → frameworks/PHP/php-phalcon-micro/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-phalcon/benchmark_config → frameworks/PHP/php-phalcon/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-phpixie/benchmark_config → frameworks/PHP/php-phpixie/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-pimf/benchmark_config → frameworks/PHP/php-pimf/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-silex-orm/benchmark_config → frameworks/PHP/php-silex-orm/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-silex/benchmark_config → frameworks/PHP/php-silex/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-slim/benchmark_config → frameworks/PHP/php-slim/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-yaf/benchmark_config → frameworks/PHP/php-yaf/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-zend-framework/benchmark_config → frameworks/PHP/php-zend-framework/benchmark_config.json


+ 0 - 0
frameworks/PHP/php-zend-framework1/benchmark_config → frameworks/PHP/php-zend-framework1/benchmark_config.json


+ 0 - 0
frameworks/PHP/php/benchmark_config → frameworks/PHP/php/benchmark_config.json


+ 0 - 0
frameworks/PHP/phreeze/benchmark_config → frameworks/PHP/phreeze/benchmark_config.json


+ 0 - 0
frameworks/PHP/symfony2-stripped/benchmark_config → frameworks/PHP/symfony2-stripped/benchmark_config.json


+ 0 - 0
frameworks/PHP/symfony2/benchmark_config → frameworks/PHP/symfony2/benchmark_config.json


+ 0 - 0
frameworks/Perl/dancer/benchmark_config → frameworks/Perl/dancer/benchmark_config.json


+ 0 - 0
frameworks/Perl/kelp/benchmark_config → frameworks/Perl/kelp/benchmark_config.json


Some files were not shown because too many files changed in this diff