Haskell/Yesod tests: Code reorg (#2258)

Moved yesod-mysql and yesod-postgres into the same directory

.travis.yml

@@ -68,7 +68,6 @@ env:
     - "TESTDIR=Haskell/snap"
     - "TESTDIR=Haskell/wai"
     - "TESTDIR=Haskell/yesod"
-    - "TESTDIR=Haskell/yesod-postgres"
     - "TESTDIR=Haskell/servant"
     - "TESTDIR=Haskell/spock"
     - "TESTDIR=Java/activeweb"

frameworks/Haskell/yesod-postgres/README.md

@@ -1,9 +0,0 @@
-# Yesod Benchmarking Test
-
-This is the Yesod portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
-
-
-## Infrastructure Software Versions
-The tests were run with:
-* GHC 7.10.3
-* Yesod 1.4

frameworks/Haskell/yesod-postgres/benchmark_config.json

@@ -1,28 +0,0 @@
-{
-  "framework": "yesod-postgres",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "db_url": "/db",
-      "query_url": "/queries/",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates/",
-      "port": 8000,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "yesod",
-      "language": "Haskell",
-      "orm": "Raw",
-      "platform": "Wai",
-      "webserver": "Warp",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "yesod-postgres",
-      "notes": "",
-      "versus": "wai"
-    }
-  }]
-}

frameworks/Haskell/yesod-postgres/setup.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends stack
-
-cd bench
-
-${IROOT}/stack --allow-different-user build --install-ghc
-
-${IROOT}/stack --allow-different-user exec bench -- ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

frameworks/Haskell/yesod-postgres/source_code

@@ -1,2 +0,0 @@
-./yesod-postgres/bench/src/
-./yesod-postgres/bench/src/Main.hs

frameworks/Haskell/yesod/.gitignore

@@ -1 +1,3 @@
-/bench/.stack-work/
+yesod-postgres/.stack-work/
+yesod-mysql-mongo/.stack-work/
+

frameworks/Haskell/yesod/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "yesod",
   "tests": [{
     "default": {
-      "setup_file": "setup",
+      "setup_file": "run_yesod_mysql_mongo",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/dbs/",
@@ -20,12 +20,12 @@
       "webserver": "Warp",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "yesod",
+      "display_name": "yesod-mysql",
       "notes": "",
       "versus": "wai"
     },
     "mongodb-raw": {
-      "setup_file": "setup",
+      "setup_file": "run_yesod_mysql_mongo",
       "db_url": "/mongo/raw/db",
       "query_url": "/mongo/raw/dbs/",
       "port": 8000,
@@ -39,7 +39,30 @@
       "webserver": "Warp",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "yesod",
+      "display_name": "yesod-mongo",
+      "notes": "",
+      "versus": "wai"
+    },
+    "postgres": {
+      "setup_file": "run_yesod_postgres",
+      "json_url": "/json",
+      "plaintext_url": "/plaintext",
+      "db_url": "/db",
+      "query_url": "/queries/",
+      "fortune_url": "/fortunes",
+      "update_url": "/updates/",
+      "port": 8000,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "yesod",
+      "language": "Haskell",
+      "orm": "Raw",
+      "platform": "Wai",
+      "webserver": "Warp",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "yesod-postgres",
       "notes": "",
       "versus": "wai"
     }

frameworks/Haskell/yesod/run_yesod_mysql_mongo.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+fw_depends stack
+
+cd yesod-mysql-mongo
+
+${IROOT}/stack --allow-different-user build --install-ghc
+
+${IROOT}/stack --allow-different-user exec yesod-mysql-mongo -- ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

frameworks/Haskell/yesod/run_yesod_postgres.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+fw_depends stack
+
+cd yesod-postgres
+
+${IROOT}/stack --allow-different-user build --install-ghc
+
+${IROOT}/stack --allow-different-user exec yesod-postgres -- ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

frameworks/Haskell/yesod/setup.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends stack
-
-cd bench
-
-${IROOT}/stack --allow-different-user build --install-ghc
-
-${IROOT}/stack --allow-different-user exec bench -- ${MAX_THREADS} ${DBHOST} +RTS -A32m -N${MAX_THREADS} &

frameworks/Haskell/yesod/bench/bench.cabal → frameworks/Haskell/yesod/yesod-mysql-mongo/yesod-mysql-mongo.cabal

@@ -1,9 +1,9 @@
-name:              bench
+name:              yesod-mysql-mongo
 version:           0.0.0
 cabal-version:     >= 1.8
 build-type:        Simple
 
-executable         bench
+executable         yesod-mysql-mongo
     main-is:           yesod.hs
     hs-source-dirs:    src
 

frameworks/Haskell/yesod-postgres/bench/bench.cabal → frameworks/Haskell/yesod/yesod-postgres/yesod-postgres.cabal

@@ -1,9 +1,9 @@
-name:              bench
+name:              yesod-postgres
 version:           0.0.0
 cabal-version:     >= 1.8
 build-type:        Simple
 
-executable         bench
+executable         yesod-postgres
     main-is:           Main.hs
     hs-source-dirs:    src