From 19c08fd03ce31ef8248a8828cff943a22755cd30 Mon Sep 17 00:00:00 2001 From: Leonhard Markert Date: Wed, 22 Apr 2020 13:45:13 +0200 Subject: [PATCH] Move tests - legacy tests now live in /test-legacy - new tests live in /test --- random.cabal | 26 ++++++++++--------- test-legacy/Legacy.hs | 15 +++++++++++ {tests/Legacy => test-legacy}/Random1283.hs | 2 +- {tests/Legacy => test-legacy}/RangeTest.hs | 2 +- {tests/Legacy => test-legacy}/T7936.hs | 2 +- .../Legacy => test-legacy}/TestRandomIOs.hs | 2 +- {tests/Legacy => test-legacy}/TestRandomRs.hs | 2 +- {tests => test}/Spec.hs | 0 {tests => test}/Spec/Range.hs | 0 {tests => test}/Spec/Run.hs | 0 {tests => test}/doctests.hs | 0 tests/Legacy.hs | 17 ------------ 12 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 test-legacy/Legacy.hs rename {tests/Legacy => test-legacy}/Random1283.hs (97%) rename {tests/Legacy => test-legacy}/RangeTest.hs (99%) rename {tests/Legacy => test-legacy}/T7936.hs (92%) rename {tests/Legacy => test-legacy}/TestRandomIOs.hs (94%) rename {tests/Legacy => test-legacy}/TestRandomRs.hs (95%) rename {tests => test}/Spec.hs (100%) rename {tests => test}/Spec/Range.hs (100%) rename {tests => test}/Spec/Run.hs (100%) rename {tests => test}/doctests.hs (100%) delete mode 100644 tests/Legacy.hs diff --git a/random.cabal b/random.cabal index fdf70d76b..b9b3eb8a3 100644 --- a/random.cabal +++ b/random.cabal @@ -28,9 +28,11 @@ custom-setup cabal-doctest >=1.0.6 && <1.1 library - exposed-modules: System.Random - , System.Random.Internal - , System.Random.Monad + exposed-modules: + System.Random + System.Random.Internal + System.Random.Monad + c-sources: cbits/CastFloatWord.cmm default-language: Haskell2010 ghc-options: -Wall @@ -40,16 +42,16 @@ library mtl >=2.2 && <2.3, splitmix >=0.0.3 && <0.1 -test-suite legacy +test-suite legacy-test type: exitcode-stdio-1.0 main-is: Legacy.hs - hs-source-dirs: tests + hs-source-dirs: test-legacy other-modules: - Legacy.T7936 - Legacy.TestRandomIOs - Legacy.TestRandomRs - Legacy.Random1283 - Legacy.RangeTest + T7936 + TestRandomIOs + TestRandomRs + Random1283 + RangeTest default-language: Haskell2010 ghc-options: -with-rtsopts=-M4M -Wno-deprecations @@ -61,7 +63,7 @@ test-suite legacy test-suite doctests type: exitcode-stdio-1.0 main-is: doctests.hs - hs-source-dirs: tests + hs-source-dirs: test default-language: Haskell2010 build-depends: base >=4.10 && <5, @@ -74,7 +76,7 @@ test-suite doctests test-suite spec type: exitcode-stdio-1.0 main-is: Spec.hs - hs-source-dirs: tests + hs-source-dirs: test other-modules: Spec.Range Spec.Run diff --git a/test-legacy/Legacy.hs b/test-legacy/Legacy.hs new file mode 100644 index 000000000..f4660fdcd --- /dev/null +++ b/test-legacy/Legacy.hs @@ -0,0 +1,15 @@ +module Main (main) where + +import qualified Random1283 as Random1283 +import qualified RangeTest as RangeTest +import qualified T7936 as T7936 +import qualified TestRandomIOs as TestRandomIOs +import qualified TestRandomRs as TestRandomRs + +main :: IO () +main = do + Random1283.main + RangeTest.main + T7936.main + TestRandomIOs.main + TestRandomRs.main diff --git a/tests/Legacy/Random1283.hs b/test-legacy/Random1283.hs similarity index 97% rename from tests/Legacy/Random1283.hs rename to test-legacy/Random1283.hs index 53505b24b..239e29d11 100644 --- a/tests/Legacy/Random1283.hs +++ b/test-legacy/Random1283.hs @@ -1,4 +1,4 @@ -module Legacy.Random1283 (main) where +module Random1283 (main) where import Control.Concurrent import Control.Monad diff --git a/tests/Legacy/RangeTest.hs b/test-legacy/RangeTest.hs similarity index 99% rename from tests/Legacy/RangeTest.hs rename to test-legacy/RangeTest.hs index c6b2e53af..ed51541c0 100644 --- a/tests/Legacy/RangeTest.hs +++ b/test-legacy/RangeTest.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} -module Legacy.RangeTest (main) where +module RangeTest (main) where import Control.Monad import System.Random diff --git a/tests/Legacy/T7936.hs b/test-legacy/T7936.hs similarity index 92% rename from tests/Legacy/T7936.hs rename to test-legacy/T7936.hs index f351634be..47b30d1c5 100644 --- a/tests/Legacy/T7936.hs +++ b/test-legacy/T7936.hs @@ -6,7 +6,7 @@ -- $ cabal test T7936 --test-options="+RTS -M1M -RTS" -- T7936: Heap exhausted; -module Legacy.T7936 where +module T7936 where import System.Random (newStdGen) import Control.Monad (replicateM_) diff --git a/tests/Legacy/TestRandomIOs.hs b/test-legacy/TestRandomIOs.hs similarity index 94% rename from tests/Legacy/TestRandomIOs.hs rename to test-legacy/TestRandomIOs.hs index cc81477b8..4af2ddcd5 100644 --- a/tests/Legacy/TestRandomIOs.hs +++ b/test-legacy/TestRandomIOs.hs @@ -6,7 +6,7 @@ -- $ cabal test TestRandomIOs --test-options="+RTS -M1M -RTS" -- TestRandomIOs: Heap exhausted; -module Legacy.TestRandomIOs where +module TestRandomIOs where import Control.Monad (replicateM) import System.Random (randomIO) diff --git a/tests/Legacy/TestRandomRs.hs b/test-legacy/TestRandomRs.hs similarity index 95% rename from tests/Legacy/TestRandomRs.hs rename to test-legacy/TestRandomRs.hs index a85431157..90145f219 100644 --- a/tests/Legacy/TestRandomRs.hs +++ b/test-legacy/TestRandomRs.hs @@ -10,7 +10,7 @@ -- $ cabal test TestRandomRs --test-options="+RTS -M1M -RTS" -- TestRandomRs: Heap exhausted; -module Legacy.TestRandomRs where +module TestRandomRs where import Control.Monad (liftM) import System.Random (randomRs, getStdGen) diff --git a/tests/Spec.hs b/test/Spec.hs similarity index 100% rename from tests/Spec.hs rename to test/Spec.hs diff --git a/tests/Spec/Range.hs b/test/Spec/Range.hs similarity index 100% rename from tests/Spec/Range.hs rename to test/Spec/Range.hs diff --git a/tests/Spec/Run.hs b/test/Spec/Run.hs similarity index 100% rename from tests/Spec/Run.hs rename to test/Spec/Run.hs diff --git a/tests/doctests.hs b/test/doctests.hs similarity index 100% rename from tests/doctests.hs rename to test/doctests.hs diff --git a/tests/Legacy.hs b/tests/Legacy.hs deleted file mode 100644 index 260743db2..000000000 --- a/tests/Legacy.hs +++ /dev/null @@ -1,17 +0,0 @@ -module Main (main) where - -import qualified Legacy.Random1283 as Random1283 -import qualified Legacy.RangeTest as RangeTest -import qualified Legacy.T7936 as T7936 -import qualified Legacy.TestRandomIOs as TestRandomIOs --- FIXME Implement 'instance UniformRange Integer', then uncomment this import. --- import qualified Legacy.TestRandomRs as TestRandomRs - -main :: IO () -main = do - Random1283.main - RangeTest.main - T7936.main - TestRandomIOs.main - -- FIXME Implement 'instance UniformRange Integer', then uncomment TestRandomRs. - -- TestRandomRs.main