From b13a00b934958499a3d416225d0c408f4278bae3 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
Date: Tue, 17 Mar 2015 20:41:01 +0100
Subject: [PATCH] Use a more informative assertion function.
---
.../tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs | 4 ++--
Cabal/tests/PackageTests/PackageTester.hs | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
index ba50730d94..484a5ea601 100644
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
@@ -13,6 +13,6 @@ suite inplaceSpec ghcPath = TestCase $ do
, configOpts = "--enable-tests" : configOpts inplaceSpec
}
confResult <- cabal_configure spec ghcPath
- assertEqual "configure failed!" (successful confResult) True
+ assertConfigureSucceeded confResult
buildResult <- cabal_build spec ghcPath
- assertEqual "build failed!" (successful buildResult) True
+ assertBuildSucceeded buildResult
diff --git a/Cabal/tests/PackageTests/PackageTester.hs b/Cabal/tests/PackageTests/PackageTester.hs
index 71c349e35a..10cf2380cc 100644
--- a/Cabal/tests/PackageTests/PackageTester.hs
+++ b/Cabal/tests/PackageTests/PackageTester.hs
@@ -19,6 +19,7 @@ module PackageTests.PackageTester
, run
-- * Test helpers
+ , assertConfigureSucceeded
, assertBuildSucceeded
, assertBuildFailed
, assertHaddockSucceeded
@@ -241,6 +242,12 @@ record spec res = do
------------------------------------------------------------------------
-- * Test helpers
+assertConfigureSucceeded :: Result -> Assertion
+assertConfigureSucceeded result = unless (successful result) $
+ assertFailure $
+ "expected: \'setup configure\' should succeed\n" ++
+ " output: " ++ outputText result
+
assertBuildSucceeded :: Result -> Assertion
assertBuildSucceeded result = unless (successful result) $
assertFailure $
--
GitLab