[commit: ghc] master: Remove `cabal07`-test broken by e4cc19de4bdbcc (c6cab9d)
git at git.haskell.org
git at git.haskell.org
Tue Dec 29 21:59:05 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/c6cab9d998b819b177962c1341208cf8b89ad398/ghc
>---------------------------------------------------------------
commit c6cab9d998b819b177962c1341208cf8b89ad398
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Tue Dec 29 22:57:29 2015 +0100
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
>---------------------------------------------------------------
c6cab9d998b819b177962c1341208cf8b89ad398
testsuite/tests/cabal/cabal07/Makefile | 21 ---------------------
testsuite/tests/cabal/cabal07/Setup.hs | 2 --
testsuite/tests/cabal/cabal07/all.T | 9 ---------
testsuite/tests/cabal/cabal07/cabal07.stderr | 6 ------
testsuite/tests/cabal/cabal07/p/LICENSE | 0
testsuite/tests/cabal/cabal07/p/P.hs | 5 -----
testsuite/tests/cabal/cabal07/p/Q.hs | 3 ---
testsuite/tests/cabal/cabal07/p/p.cabal | 12 ------------
8 files changed, 58 deletions(-)
diff --git a/testsuite/tests/cabal/cabal07/Makefile b/testsuite/tests/cabal/cabal07/Makefile
deleted file mode 100644
index 1dfed8a..0000000
--- 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 9a994af..0000000
--- 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 2052c89..0000000
--- 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 b3cfe5b..0000000
--- 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 e69de29..0000000
diff --git a/testsuite/tests/cabal/cabal07/p/P.hs b/testsuite/tests/cabal/cabal07/p/P.hs
deleted file mode 100644
index c9458dd..0000000
--- 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 4887939..0000000
--- 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 2699e93..0000000
--- 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 at 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
More information about the ghc-commits
mailing list