From 14f2143e03e5360d532f7f6183d560821d24e017 Mon Sep 17 00:00:00 2001
From: Bodigrim <andrew.lelechenko@gmail.com>
Date: Wed, 10 Mar 2021 00:00:11 +0000
Subject: [PATCH] Merge th-tests into tests
---
cabal.project | 1 -
tests/Tests.hs | 7 +++++-
{th-tests/tests => tests/Tests}/Lift.hs | 2 +-
tests/text-tests.cabal | 2 ++
th-tests/LICENSE | 26 ---------------------
th-tests/tests/th-tests.hs | 12 ----------
th-tests/th-tests.cabal | 31 -------------------------
7 files changed, 9 insertions(+), 72 deletions(-)
rename {th-tests/tests => tests/Tests}/Lift.hs (96%)
delete mode 100644 th-tests/LICENSE
delete mode 100644 th-tests/tests/th-tests.hs
delete mode 100644 th-tests/th-tests.cabal
diff --git a/cabal.project b/cabal.project
index 5393178a..ed1fd79d 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,6 +1,5 @@
-- See http://cabal.readthedocs.io/en/latest/nix-local-build-overview.html
packages: .
packages: tests
-packages: th-tests
packages: benchmarks
tests: True
diff --git a/tests/Tests.hs b/tests/Tests.hs
index 325cc39f..72057952 100644
--- a/tests/Tests.hs
+++ b/tests/Tests.hs
@@ -6,8 +6,13 @@ module Main
import Test.Tasty (defaultMain, testGroup)
+import qualified Tests.Lift as Lift
import qualified Tests.Properties as Properties
import qualified Tests.Regressions as Regressions
main :: IO ()
-main = defaultMain $ testGroup "All" [Properties.tests, Regressions.tests]
+main = defaultMain $ testGroup "All"
+ [ Lift.tests
+ , Properties.tests
+ , Regressions.tests
+ ]
diff --git a/th-tests/tests/Lift.hs b/tests/Tests/Lift.hs
similarity index 96%
rename from th-tests/tests/Lift.hs
rename to tests/Tests/Lift.hs
index 971654b2..11e71932 100644
--- a/th-tests/tests/Lift.hs
+++ b/tests/Tests/Lift.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-}
-module Lift
+module Tests.Lift
( tests
)
where
diff --git a/tests/text-tests.cabal b/tests/text-tests.cabal
index 3ce6fc20..260e4ec8 100644
--- a/tests/text-tests.cabal
+++ b/tests/text-tests.cabal
@@ -69,6 +69,7 @@ test-suite tests
hs-source-dirs: .
main-is: Tests.hs
other-modules:
+ Tests.Lift
Tests.Properties
Tests.Properties.Mul
Tests.QuickCheckUtils
@@ -87,6 +88,7 @@ test-suite tests
tasty,
tasty-hunit,
tasty-quickcheck,
+ template-haskell,
text
default-language: Haskell2010
diff --git a/th-tests/LICENSE b/th-tests/LICENSE
deleted file mode 100644
index 3c92c1b9..00000000
--- a/th-tests/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2008-2009, Tom Harper
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/th-tests/tests/th-tests.hs b/th-tests/tests/th-tests.hs
deleted file mode 100644
index 56d3614c..00000000
--- a/th-tests/tests/th-tests.hs
+++ /dev/null
@@ -1,12 +0,0 @@
--- | Provides a simple main function which runs all the tests
---
-module Main
- ( main
- ) where
-
-import Test.Tasty (defaultMain)
-
-import qualified Lift
-
-main :: IO ()
-main = defaultMain Lift.tests
diff --git a/th-tests/th-tests.cabal b/th-tests/th-tests.cabal
deleted file mode 100644
index 33c3a9dd..00000000
--- a/th-tests/th-tests.cabal
+++ /dev/null
@@ -1,31 +0,0 @@
-cabal-version: 2.2
-name: th-tests
-version: 0
-synopsis: TH text tests
-maintainer: text maintainers
-description:
- Tests that use 'Text' functions during compile time.
- .
- These are in a separate package because of https://github.com/haskell/cabal/issues/5623
-license: BSD-2-Clause
-license-file: LICENSE
-category: Text
-tested-with: GHC==9.0.1,
- GHC==8.10.4, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4,
- GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4,
- GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4
-
-test-suite th-tests
- default-language: Haskell2010
- type: exitcode-stdio-1.0
- hs-source-dirs:
- tests/
- main-is: th-tests.hs
- other-modules:
- Lift
- build-depends:
- base <5,
- template-haskell,
- text,
- tasty,
- tasty-hunit
--
GitLab