From f42f4dcc21cbae14223964035ed8c42ffe27e290 Mon Sep 17 00:00:00 2001 From: yamadapc Date: Fri, 24 Jun 2016 17:14:56 -0300 Subject: [PATCH] Workspace update --- test/Makefile | 4 ++ test/ghcjs-commonjs-test.cabal | 12 +----- test/stack.yaml | 74 +++++----------------------------- test/test/TypeCheckSpec.hs | 9 +++++ 4 files changed, 24 insertions(+), 75 deletions(-) create mode 100644 test/Makefile create mode 100644 test/test/TypeCheckSpec.hs diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 0000000..21bb9f2 --- /dev/null +++ b/test/Makefile @@ -0,0 +1,4 @@ +test: FORCE + stack test --resolver=lts-5.3 --compiler=ghc-7.10.3 + +FORCE: diff --git a/test/ghcjs-commonjs-test.cabal b/test/ghcjs-commonjs-test.cabal index 8063856..7d20f96 100644 --- a/test/ghcjs-commonjs-test.cabal +++ b/test/ghcjs-commonjs-test.cabal @@ -1,27 +1,17 @@ --- Initial ghcjs-commonjs-test.cabal generated by cabal init. For further --- documentation, see http://haskell.org/cabal/users-guide/ - name: ghcjs-commonjs-test version: 0.1.0.0 --- synopsis: --- description: license: MIT license-file: LICENSE author: Pedro Tacla Yamada maintainer: tacla.yamada@gmail.com --- copyright: --- category: build-type: Simple --- extra-source-files: cabal-version: >=1.10 library - -- exposed-modules: - -- other-modules: - -- other-extensions: build-depends: base >=4.8 && <4.9 hs-source-dirs: src default-language: Haskell2010 + test-suite hspec main-is: Spec.hs type: exitcode-stdio-1.0 diff --git a/test/stack.yaml b/test/stack.yaml index 5b3adc4..eb3adf5 100644 --- a/test/stack.yaml +++ b/test/stack.yaml @@ -1,66 +1,12 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# http://docs.haskellstack.org/en/stable/yaml_configuration/ +resolver: lts-5.5 +compiler: ghcjs-0.2.0.20160414_ghc-7.10.3 +compiler-check: match-exact +setup-info: + ghcjs: + source: + ghcjs-0.2.0.20160414_ghc-7.10.3: + url: https://s3.amazonaws.com/ghcjs/ghcjs-0.2.0.20160414_ghc-7.10.3.tar.gz + sha1: 6d6f307503be9e94e0c96ef1308c7cf224d06be3 -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# resolver: ghcjs-0.1.0_ghc-7.10.2 -# resolver: -# name: custom-snapshot -# location: "./custom-snapshot.yaml" -resolver: lts-6.4 - -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# - location: -# git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# extra-dep: true -# subdirs: -# - auto-update -# - wai -# -# A package marked 'extra-dep: true' will only be built if demanded by a -# non-dependency (i.e. a user package), and its test suites and benchmarks -# will not be run. This is useful for tweaking upstream packages. packages: -- '.' -# Dependency packages to be pulled from upstream that are not in the resolver -# (e.g., acme-missiles-0.3) -extra-deps: [] - -# Override default flag values for local packages and extra-deps -flags: {} - -# Extra package databases containing global packages -extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=1.1" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor \ No newline at end of file +- . diff --git a/test/test/TypeCheckSpec.hs b/test/test/TypeCheckSpec.hs new file mode 100644 index 0000000..1ebe612 --- /dev/null +++ b/test/test/TypeCheckSpec.hs @@ -0,0 +1,9 @@ +module TypeCheckSpec where + +import GHCJS.CommonJS +import Test.Hspec + +spec :: Spec +spec = describe "TypeCheck" $ + describe "exports" $ do + it "type checks" $ True `shouldBe` True