Repository : ssh://darcs.haskell.org//srv/darcs/packages/containers On branch : master
http://hackage.haskell.org/trac/ghc/changeset/189b16ea02ce82a39f7a572da08b883f5f3c1aad >--------------------------------------------------------------- commit 189b16ea02ce82a39f7a572da08b883f5f3c1aad Author: Milan Straka <[email protected]> Date: Fri Mar 2 17:48:44 2012 +0100 Disable ropt_plain_output. The ropt_plain_output was used to disables ansi sequences in the test log. But it works only for test-framework < 0.5. In test-framework >= 0.5, ropt_plain_output no longer exists. The line "ropt_color_mode = Just ColorNever" can be used, but test-framework >= 0.5 detects it is not writing to the terminal and disables ansi sequences by itself. It is difficult to compile ropt_plain_output conditionally for test-framework < 0.5 only (MIN_VERSION_* macros are not defined for dependencies of tests, conditions in cabal tests do not work for ghc-7.0). We therefore do not set ropt_plain_output and live with ansi sequences in test logs produces by test-framework < 0.5. >--------------------------------------------------------------- tests/intmap-properties.hs | 3 +-- tests/intset-properties.hs | 3 +-- tests/map-properties.hs | 3 +-- tests/seq-properties.hs | 4 ++-- tests/set-properties.hs | 3 +-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/intmap-properties.hs b/tests/intmap-properties.hs index 58baff4..534b829 100644 --- a/tests/intmap-properties.hs +++ b/tests/intmap-properties.hs @@ -144,8 +144,7 @@ main = defaultMainWithOpts ] opts where - opts = mempty { ropt_plain_output = Just True - , ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 + opts = mempty { ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 , topt_maximum_unsuitable_generated_tests = Just 500 } } diff --git a/tests/intset-properties.hs b/tests/intset-properties.hs index 48f60f4..b80d27d 100644 --- a/tests/intset-properties.hs +++ b/tests/intset-properties.hs @@ -46,8 +46,7 @@ main = defaultMainWithOpts [ testProperty "prop_Single" prop_Single , testProperty "prop_filter" prop_filter ] opts where - opts = mempty { ropt_plain_output = Just True - , ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 + opts = mempty { ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 , topt_maximum_unsuitable_generated_tests = Just 500 } } diff --git a/tests/map-properties.hs b/tests/map-properties.hs index 0fe4048..bcca177 100644 --- a/tests/map-properties.hs +++ b/tests/map-properties.hs @@ -170,8 +170,7 @@ main = defaultMainWithOpts ] opts where - opts = mempty { ropt_plain_output = Just True - , ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 + opts = mempty { ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 , topt_maximum_unsuitable_generated_tests = Just 500 } } diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs index 992df6b..48ceebf 100644 --- a/tests/seq-properties.hs +++ b/tests/seq-properties.hs @@ -93,11 +93,11 @@ main = defaultMainWithOpts ] opts where - opts = mempty { ropt_plain_output = Just True - , ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 + opts = mempty { ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 , topt_maximum_unsuitable_generated_tests = Just 500 } } + ------------------------------------------------------------------------ -- Arbitrary ------------------------------------------------------------------------ diff --git a/tests/set-properties.hs b/tests/set-properties.hs index 831ace3..260b42f 100644 --- a/tests/set-properties.hs +++ b/tests/set-properties.hs @@ -49,8 +49,7 @@ main = defaultMainWithOpts [ testProperty "prop_Valid" prop_Valid , testProperty "prop_filter" prop_filter ] opts where - opts = mempty { ropt_plain_output = Just True - , ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 + opts = mempty { ropt_test_options = Just $ mempty { topt_maximum_generated_tests = Just 500 , topt_maximum_unsuitable_generated_tests = Just 500 } } _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
