Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

change build incantations to use cabal's test stanza for KAT tests.

  • Loading branch information...
commit b908b7b963266efb33ec3255edd02cd02db639da 1 parent 997cdc9
Vincent Hanquez authored

Showing 2 changed files with 13 additions and 28 deletions. Show diff stats Hide diff stats

  1. 0  Tests.hs → Tests/KAT.hs
  2. +13 28 cryptohash.cabal
0  Tests.hs → Tests/KAT.hs
File renamed without changes
41 cryptohash.cabal
@@ -14,7 +14,7 @@ Maintainer: Vincent Hanquez <vincent@snarc.org>
14 14 Synopsis: collection of crypto hashes, fast, pure and practical
15 15 Category: Data, Cryptography
16 16 Build-Type: Simple
17   -Cabal-Version: >=1.6
  17 +Cabal-Version: >=1.8
18 18 Homepage: http://github.com/vincenthz/hs-cryptohash
19 19 data-files: README.md
20 20
@@ -24,10 +24,6 @@ extra-source-files:
24 24 cbits/skein.h cbits/skein256.h cbits/skein512.h
25 25 cbits/tiger.h cbits/whirlpool.h
26 26
27   -Flag test
28   - Description: Build unit test
29   - Default: False
30   -
31 27 Flag benchmark
32 28 Description: Build benchmark test
33 29 Default: False
@@ -75,29 +71,18 @@ Library
75 71 cbits/whirlpool.c
76 72 Include-Dirs: cbits
77 73
78   -Executable Tests
79   - Main-Is: Tests.hs
80   - Extensions: ForeignFunctionInterface
81   - C-sources: cbits/sha1.c
82   - cbits/sha256.c
83   - cbits/sha512.c
84   - cbits/sha3.c
85   - cbits/md2.c
86   - cbits/md4.c
87   - cbits/md5.c
88   - cbits/ripemd.c
89   - cbits/skein256.c
90   - cbits/skein512.c
91   - cbits/tiger.c
92   - cbits/whirlpool.c
93   - if flag(test)
94   - Buildable: True
95   - Build-depends: base >= 4, HUnit, bytestring
96   - else
97   - Buildable: False
98   - if flag(cryptoapi)
99   - Build-depends: crypto-api >= 0.5, tagged >= 0.1, cereal >= 0.2
100   - cpp-options: -DHAVE_CRYPTOAPI
  74 +Test-Suite test-kat
  75 + type: exitcode-stdio-1.0
  76 + hs-source-dirs: Tests
  77 + Main-Is: KAT.hs
  78 + Build-depends: base >= 4 && < 5
  79 + , bytestring
  80 + , HUnit
  81 + , QuickCheck >= 2
  82 + , test-framework >= 0.3.3 && < 0.7
  83 + , test-framework-quickcheck2 >= 0.2.9 && < 0.3
  84 + , test-framework-hunit
  85 + , cryptohash
101 86
102 87 Executable Bench
103 88 Main-Is: Bench.hs

0 comments on commit b908b7b

Please sign in to comment.
Something went wrong with that request. Please try again.