Переглянути джерело

Haskell framework fixes (#4522)

* Haskell framework fixes

* wai fix

* remove Haskell/wai
Nate 6 роки тому
батько
коміт
66f69a7119

+ 0 - 1
.travis.yml

@@ -36,7 +36,6 @@ env:
     - 'TESTDIR="GO/evio GO/fasthttp GO/go-std GO/iris"'
     - "TESTLANG=Groovy"
     - "TESTDIR=Haskell/snap"
-    - "TESTDIR=Haskell/wai"
     - "TESTDIR=Haskell/yesod"
     - "TESTDIR=Haskell/servant"
     - "TESTDIR=Haskell/spock"

+ 1 - 1
frameworks/Haskell/snap/bench/snap-bench.cabal

@@ -8,7 +8,7 @@ Maintainer:          [email protected]
 Stability:           Experimental
 Category:            Web
 Build-type:          Simple
-Cabal-version:       >=1.2
+Cabal-version:       <=1.2
 
 Executable snap-bench
   hs-source-dirs: src

+ 0 - 22
frameworks/Haskell/wai/bench/bench.cabal

@@ -1,22 +0,0 @@
-name:              bench
-version:           0.0.0
-cabal-version:     >= 1.8
-build-type:        Simple
-
-executable         bench
-    main-is:           wai.hs
-    hs-source-dirs:    .
-
-    ghc-options:       -Wall -threaded -O2 -rtsopts
-
-    extensions: OverloadedStrings
-
-    build-depends: base
-                 , aeson
-                 , http-types
-                 , network
-                 , text
-                 , wai
-                 , warp
-                 , blaze-builder
-                 , bytestring

+ 0 - 5
frameworks/Haskell/wai/bench/stack.yaml

@@ -1,5 +0,0 @@
-flags: {}
-packages:
-- '.'
-extra-deps: []
-resolver: lts-10.0

+ 0 - 30
frameworks/Haskell/wai/bench/wai.hs

@@ -1,30 +0,0 @@
-{-# LANGUAGE OverloadedStrings, BangPatterns #-}
-
-import Blaze.ByteString.Builder (copyByteString)
-import Control.Concurrent (runInUnboundThread)
-import Data.Aeson ((.=), object, encode)
-import qualified Data.ByteString.Lazy as L
-import Data.Text (Text)
-import Network.HTTP.Types (status200, status404)
-import Network.Wai (responseBuilder, rawPathInfo)
-import qualified Network.Wai.Handler.Warp as W
-
-main :: IO ()
-main =
-    runInUnboundThread $ W.runSettings settings app
-  where
-    settings = W.setPort 8000
-             $ W.setOnException (\_ _ -> return ()) W.defaultSettings
-    app request respond = case rawPathInfo request of
-        "/json" -> respond responseJson
-        "/plaintext" -> respond responsePlaintext
-        _ -> respond $ responseBuilder status404 [] ""
-    !responseJson = responseBuilder status200 ctJson json
-    ctJson = [("Content-Type", "application/json")]
-    !json = copyByteString
-          $ L.toStrict
-          $ encode
-          $ object ["message" .= ("Hello, World!" :: Text)]
-    !responsePlaintext = responseBuilder status200 ctPlaintext plaintext
-    ctPlaintext = [("Content-type", "text/plain")]
-    plaintext = "Hello, World!"

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

@@ -1,24 +0,0 @@
-{
-  "framework": "wai",
-  "tests": [{
-    "default": {
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "port": 8000,
-      "approach": "Stripped",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "None",
-      "language": "Haskell",
-      "flavor": "GHC78",
-      "orm": "Full",
-      "platform": "None",
-      "webserver": "Warp",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "wai",
-      "notes": "",
-      "versus": "wai"
-    }
-  }]
-}

+ 0 - 12
frameworks/Haskell/wai/wai.dockerfile

@@ -1,12 +0,0 @@
-FROM haskell:8.2.1
-
-RUN apt update -yqq && apt install -yqq xz-utils make netbase
-
-ADD ./ /wai
-WORKDIR /wai
-
-RUN stack upgrade
-
-RUN cd bench && stack --allow-different-user build --install-ghc
-
-CMD cd bench && stack --allow-different-user exec bench -- $(nproc) tfb-database +RTS -A32m -N$(nproc)