From d8fa46181c523ece152bd3aa7a31a29e21929a5b Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <ezyang@cs.stanford.edu>
Date: Sat, 25 Jul 2015 16:25:41 -0700
Subject: [PATCH] Properly use test name for test libraries, with updated test.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
---
Cabal/Distribution/Simple/Build.hs | 2 +-
Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs | 2 ++
.../tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs | 6 ++++++
Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal | 5 +++++
4 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs
diff --git a/Cabal/Distribution/Simple/Build.hs b/Cabal/Distribution/Simple/Build.hs
index ea68988492..b5a027b662 100644
--- a/Cabal/Distribution/Simple/Build.hs
+++ b/Cabal/Distribution/Simple/Build.hs
@@ -407,7 +407,7 @@ testSuiteLibV09AsLibAndExe pkg_descr
libClbi = LibComponentLocalBuildInfo
{ componentPackageDeps = componentPackageDeps clbi
, componentPackageRenaming = componentPackageRenaming clbi
- , componentLibraryName = LibraryName "test"
+ , componentLibraryName = LibraryName (testName test)
, componentExposedModules = [IPI.ExposedModule m Nothing Nothing]
, componentPackageKey = OldPackageKey (PackageIdentifier (PackageName (testName test)) (pkgVersion (package pkg_descr)))
}
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
index 17c16edaac..35df95eac8 100644
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Check.hs
@@ -16,3 +16,5 @@ suite config = do
assertConfigureSucceeded confResult
buildResult <- cabal_build config spec
assertBuildSucceeded buildResult
+ testResult <- cabal_test config spec [] ["test-Dummy", "test-Dummy2"]
+ assertTestSucceeded testResult
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs
new file mode 100644
index 0000000000..6de3176f6e
--- /dev/null
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/Dummy2.hs
@@ -0,0 +1,6 @@
+module Dummy2 where
+
+import Distribution.TestSuite (Test)
+
+tests :: IO [Test]
+tests = return []
diff --git a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
index d3c3e7cd68..85d0992b49 100644
--- a/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
+++ b/Cabal/tests/PackageTests/BuildTestSuiteDetailedV09/my.cabal
@@ -18,3 +18,8 @@ test-suite test-Dummy
type: detailed-0.9
test-module: Dummy
build-depends: base, Cabal
+
+test-suite test-Dummy2
+ type: detailed-0.9
+ test-module: Dummy2
+ build-depends: base, Cabal
--
GitLab