Merge pull request #2427 from nbrady-techempower/perl-kelp

Kelp framework fix

frameworks/Perl/kelp/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "kelp",
   "tests": [{
     "default": {
-      "setup_file": "setup-mysql",
+      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -24,7 +24,7 @@
       "versus": ""
     },
     "mongodb": {
-      "setup_file": "setup-mongodb",
+      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries/mongo?queries=",

frameworks/Perl/kelp/setup-mongodb.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb
-
-source ./setup.sh

frameworks/Perl/kelp/setup-mysql.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql
-
-source ./setup.sh

frameworks/Perl/kelp/setup.sh

@@ -4,7 +4,7 @@ sed -i 's|localhost|'"${DBHOST}"'|g' app.pl
 sed -i 's|user .*;|user '"$(id -u -n)"';|g' nginx.conf
 sed -i 's|server unix.*frameworks-benchmark.sock;|server unix:'"${TROOT}"'/frameworks-benchmark.sock;|g' nginx.conf
 
-fw_depends perl nginx
+fw_depends perl nginx mysql mongodb
 
 cpanm --notest --no-man-page \
     [email protected] \