diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-29 22:57:29 +0100 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-29 22:57:29 +0100 |
commit | c6cab9d998b819b177962c1341208cf8b89ad398 (patch) | |
tree | a3dfb1aa34ed5f7e1216f91b6fc34a6c7541f667 /testsuite/tests/cabal | |
parent | e4cc19de4bdbccea589d41717e31d63b088a8990 (diff) | |
download | haskell-c6cab9d998b819b177962c1341208cf8b89ad398.tar.gz |
Remove `cabal07`-test broken by e4cc19de4bdbcc
This test is no longer legitimate as the feature it tests was removed
from Cabal via
https://git.haskell.org/packages/Cabal.git/commitdiff/5d20551e44e565bad6335fa213fc4ad592db7225
Diffstat (limited to 'testsuite/tests/cabal')
-rw-r--r-- | testsuite/tests/cabal/cabal07/Makefile | 21 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/Setup.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/all.T | 9 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/cabal07.stderr | 6 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/p/LICENSE | 0 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/p/P.hs | 5 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/p/Q.hs | 3 | ||||
-rw-r--r-- | testsuite/tests/cabal/cabal07/p/p.cabal | 12 |
8 files changed, 0 insertions, 58 deletions
diff --git a/testsuite/tests/cabal/cabal07/Makefile b/testsuite/tests/cabal/cabal07/Makefile deleted file mode 100644 index 1dfed8aad1..0000000000 --- a/testsuite/tests/cabal/cabal07/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP=../../.. -include $(TOP)/mk/boilerplate.mk -include $(TOP)/mk/test.mk - -SETUP=../Setup -v0 - -# This test is for a Cabal package with thinning and renaming - -cabal07: clean - $(MAKE) clean - '$(TEST_HC)' -v0 --make Setup - cd p && $(SETUP) clean - cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --prefix='$(PWD)/inst-p' --constraint="containers>=0" - cd p && ! $(SETUP) build -ifneq "$(CLEANUP)" "" - $(MAKE) clean -endif - -clean : - '$(GHC_PKG)' unregister --force p >/dev/null 2>&1 || true - $(RM) -r tmp.d inst-* *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext) diff --git a/testsuite/tests/cabal/cabal07/Setup.hs b/testsuite/tests/cabal/cabal07/Setup.hs deleted file mode 100644 index 9a994af677..0000000000 --- a/testsuite/tests/cabal/cabal07/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/testsuite/tests/cabal/cabal07/all.T b/testsuite/tests/cabal/cabal07/all.T deleted file mode 100644 index 2052c891f2..0000000000 --- a/testsuite/tests/cabal/cabal07/all.T +++ /dev/null @@ -1,9 +0,0 @@ -if default_testopts.cleanup != '': - cleanup = 'CLEANUP=1' -else: - cleanup = '' - -test('cabal07', - normalise_version('containers'), - run_command, - ['$MAKE -s --no-print-directory cabal07 ' + cleanup]) diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr deleted file mode 100644 index b3cfe5b152..0000000000 --- a/testsuite/tests/cabal/cabal07/cabal07.stderr +++ /dev/null @@ -1,6 +0,0 @@ - -Q.hs:3:1: error: - Failed to load interface for ‘Data.Set’ - It is a member of the hidden package ‘containers-0.5.7.0’. - Perhaps you need to add ‘containers’ to the build-depends in your .cabal file. - Use -v to see a list of the files searched for. diff --git a/testsuite/tests/cabal/cabal07/p/LICENSE b/testsuite/tests/cabal/cabal07/p/LICENSE deleted file mode 100644 index e69de29bb2..0000000000 --- a/testsuite/tests/cabal/cabal07/p/LICENSE +++ /dev/null diff --git a/testsuite/tests/cabal/cabal07/p/P.hs b/testsuite/tests/cabal/cabal07/p/P.hs deleted file mode 100644 index c9458ddae3..0000000000 --- a/testsuite/tests/cabal/cabal07/p/P.hs +++ /dev/null @@ -1,5 +0,0 @@ -module P where -import qualified Set -import qualified Seq -import qualified Seq2 -import qualified Control.DeepSeq diff --git a/testsuite/tests/cabal/cabal07/p/Q.hs b/testsuite/tests/cabal/cabal07/p/Q.hs deleted file mode 100644 index 488793979f..0000000000 --- a/testsuite/tests/cabal/cabal07/p/Q.hs +++ /dev/null @@ -1,3 +0,0 @@ -module Q where -import P -import Data.Set diff --git a/testsuite/tests/cabal/cabal07/p/p.cabal b/testsuite/tests/cabal/cabal07/p/p.cabal deleted file mode 100644 index 2699e93d5a..0000000000 --- a/testsuite/tests/cabal/cabal07/p/p.cabal +++ /dev/null @@ -1,12 +0,0 @@ -name: p -version: 1.0 -license-file: LICENSE -author: Edward Z. Yang -maintainer: ezyang@cs.stanford.edu -build-type: Simple -cabal-version: >=1.20 - -library - exposed-modules: P, Q - build-depends: base, containers >= 0.1 (Data.Set as Set), deepseq (> 0.2 && > 0.1) with (Control.DeepSeq as Seq, Control.DeepSeq as Seq2) - default-language: Haskell2010 |