Revert "Revert "Revert "Support for multiple signature files in scope."""

This reverts commit 214596de224afa576a9c295bcf53c6941d6892e0.

26 files changed, 1 insertions, 218 deletions

diff --git a/testsuite/tests/cabal/sigcabal02/Main.hs b/testsuite/tests/cabal/sigcabal02/Main.hs
deleted file mode 100644
index 52def3d41f..0000000000
--- a/testsuite/tests/cabal/sigcabal02/Main.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-import Map
-import P
-import Q
-
-main = do
-    x <- foo
-    print (mymember 5 x)
diff --git a/testsuite/tests/cabal/sigcabal02/Makefile b/testsuite/tests/cabal/sigcabal02/Makefile
deleted file mode 100644
index c45697d1b6..0000000000
--- a/testsuite/tests/cabal/sigcabal02/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-SETUP=../Setup -v0
-
-# This test is for two Cabal packages exposing the same signature
-
-sigcabal02:
-	$(MAKE) clean
-	'$(GHC_PKG)' field containers id | sed 's/^.*: *//' > containers
-	'$(GHC_PKG)' init tmp.d
-	'$(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)' --package-db=../tmp.d --prefix='$(PWD)/inst-p' --instantiate-with="Map=Data.Map.Lazy@`cat ../containers`" --instantiate-with="Set=Data.Set@`cat ../containers`" --ghc-pkg-options="--enable-multi-instance"
-	cd p && $(SETUP) build
-	cd p && $(SETUP) copy
-	cd p && $(SETUP) register --print-ipid > ../p_ipid
-	cd q && $(SETUP) clean
-	cd q && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/inst-p' --instantiate-with="Map=Data.Map.Lazy@`cat ../containers`" --ghc-pkg-options="--enable-multi-instance"
-	cd q && $(SETUP) build
-	cd q && $(SETUP) copy
-	cd q && $(SETUP) register --print-ipid > ../q_ipid
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-db=tmp.d -hide-all-packages -package base -package containers -package-id "`cat p_ipid`" -package-id "`cat q_ipid`" --make Main.hs
-	./Main
-	! '$(TEST_HC)' $(TEST_HC_OPTS) -package-db=tmp.d -hide-all-packages -package base -package containers -package-id "`cat p_ipid`" -package-id "`cat q_ipid`" --make ShouldFail.hs
-ifneq "$(CLEANUP)" ""
-	$(MAKE) clean
-endif
-
-clean :
-	'$(GHC_PKG)' unregister --force p >/dev/null 2>&1 || true
-	'$(GHC_PKG)' unregister --force q >/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/sigcabal02/Setup.hs b/testsuite/tests/cabal/sigcabal02/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/testsuite/tests/cabal/sigcabal02/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/testsuite/tests/cabal/sigcabal02/ShouldFail.hs b/testsuite/tests/cabal/sigcabal02/ShouldFail.hs
deleted file mode 100644
index 98ec49e886..0000000000
--- a/testsuite/tests/cabal/sigcabal02/ShouldFail.hs
+++ /dev/null
@@ -1 +0,0 @@
-import Set
diff --git a/testsuite/tests/cabal/sigcabal02/all.T b/testsuite/tests/cabal/sigcabal02/all.T
deleted file mode 100644
index 11eb05975b..0000000000
--- a/testsuite/tests/cabal/sigcabal02/all.T
+++ /dev/null
@@ -1,9 +0,0 @@
-if default_testopts.cleanup != '':
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = ''
-
-test('sigcabal02',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory sigcabal02 ' + cleanup])
diff --git a/testsuite/tests/cabal/sigcabal02/p/LICENSE b/testsuite/tests/cabal/sigcabal02/p/LICENSE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/cabal/sigcabal02/p/LICENSE
+++ /dev/null
diff --git a/testsuite/tests/cabal/sigcabal02/p/Map.hsig b/testsuite/tests/cabal/sigcabal02/p/Map.hsig
deleted file mode 100644
index 359cf64ab9..0000000000
--- a/testsuite/tests/cabal/sigcabal02/p/Map.hsig
+++ /dev/null
@@ -1,18 +0,0 @@
-{-# LANGUAGE RoleAnnotations #-}
-module Map where
-
-import Set
-
-type role Map nominal representational
-data Map k a
-
-instance (Show k, Show a) => Show (Map k a)
-
-size :: Map k a -> Int
-lookup :: Ord k => k -> Map k a -> Maybe a
-empty :: Map k a
-insert :: Ord k => k -> a -> Map k a -> Map k a
-delete :: Ord k => k -> Map k a -> Map k a
-
-keysSet :: Map k a -> Set k
-fromSet :: (k -> a) -> Set k -> Map k a
diff --git a/testsuite/tests/cabal/sigcabal02/p/P.hs b/testsuite/tests/cabal/sigcabal02/p/P.hs
deleted file mode 100644
index dec6b41c94..0000000000
--- a/testsuite/tests/cabal/sigcabal02/p/P.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-module P where
-
-import qualified Map
-import qualified Set
-
-foo = do
-    let x = Map.insert 0 "foo"
-          . Map.insert (6 :: Int) "foo"
-          $ Map.empty
-    print (Map.lookup 1 x)
-    print (Set.size (Map.keysSet x))
-    return x
diff --git a/testsuite/tests/cabal/sigcabal02/p/Set.hsig b/testsuite/tests/cabal/sigcabal02/p/Set.hsig
deleted file mode 100644
index 1713133365..0000000000
--- a/testsuite/tests/cabal/sigcabal02/p/Set.hsig
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# LANGUAGE RoleAnnotations #-}
-module Set where
-
-type role Set nominal
-data Set a
-
-instance Show a => Show (Set a)
-
-size :: Set a -> Int
-member :: Ord a => a -> Set a -> Bool
-empty :: Set a
-insert :: Ord a => a -> Set a -> Set a
-delete :: Ord a => a -> Set a -> Set a
diff --git a/testsuite/tests/cabal/sigcabal02/p/p.cabal b/testsuite/tests/cabal/sigcabal02/p/p.cabal
deleted file mode 100644
index bb3b2a4463..0000000000
--- a/testsuite/tests/cabal/sigcabal02/p/p.cabal
+++ /dev/null
@@ -1,14 +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
-  exposed-signatures:  Map
-  required-signatures: Set
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/testsuite/tests/cabal/sigcabal02/q/LICENSE b/testsuite/tests/cabal/sigcabal02/q/LICENSE
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/cabal/sigcabal02/q/LICENSE
+++ /dev/null
diff --git a/testsuite/tests/cabal/sigcabal02/q/Map.hsig b/testsuite/tests/cabal/sigcabal02/q/Map.hsig
deleted file mode 100644
index 40fd0bc74c..0000000000
--- a/testsuite/tests/cabal/sigcabal02/q/Map.hsig
+++ /dev/null
@@ -1,7 +0,0 @@
-{-# LANGUAGE RoleAnnotations #-}
-module Map where
-
-type role Map nominal representational
-data Map k a
-
-member :: Ord k => k -> Map k a -> Bool
diff --git a/testsuite/tests/cabal/sigcabal02/q/Q.hs b/testsuite/tests/cabal/sigcabal02/q/Q.hs
deleted file mode 100644
index ba55fb97b7..0000000000
--- a/testsuite/tests/cabal/sigcabal02/q/Q.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Q where
-
-import qualified Map
-import Map(Map)
-
-mymember :: Int -> Map Int a -> Bool
-mymember k m = Map.member k m || Map.member (k + 1) m
diff --git a/testsuite/tests/cabal/sigcabal02/q/q.cabal b/testsuite/tests/cabal/sigcabal02/q/q.cabal
deleted file mode 100644
index 2f99c4403c..0000000000
--- a/testsuite/tests/cabal/sigcabal02/q/q.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
-name:                q
-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:     Q
-  exposed-signatures:  Map
-  build-depends:       base
-  default-language:    Haskell2010
diff --git a/testsuite/tests/cabal/sigcabal02/sigcabal02.stderr b/testsuite/tests/cabal/sigcabal02/sigcabal02.stderr
deleted file mode 100644
index 7c1f09239f..0000000000
--- a/testsuite/tests/cabal/sigcabal02/sigcabal02.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-ShouldFail.hs:1:8:
-    Could not find module ‘Set’
-    Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/cabal/sigcabal02/sigcabal02.stdout b/testsuite/tests/cabal/sigcabal02/sigcabal02.stdout
deleted file mode 100644
index 48cb59e63a..0000000000
--- a/testsuite/tests/cabal/sigcabal02/sigcabal02.stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-[1 of 1] Compiling Main             ( Main.hs, Main.o )
-Linking Main ...
-Nothing
-2
-True
diff --git a/testsuite/tests/driver/recomp014/Makefile b/testsuite/tests/driver/recomp014/Makefile
deleted file mode 100644
index e788110097..0000000000
--- a/testsuite/tests/driver/recomp014/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# -fforce-recomp makes lots of driver tests trivially pass, so we
-# filter it out from $(TEST_HC_OPTS).
-TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
-
-# Recompilation tests
-
-clean:
-	rm -f *.o *.hi
-
-recomp014: clean
-	echo 'module A where a = False' > A.hs
-	echo 'module A1 where a = False' > A1.hs
-	echo 'module B where a :: Bool' > B.hsig
-	echo 'first run'
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c A1.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c B.hsig -sig-of "B is main:A"
-	echo 'import B; main = print a' > C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c C.hs
-	echo 'second run'
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c B.hsig -sig-of "B is main:A1"
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) A1.o C.o -o recomp014
-	./recomp014
-
-.PHONY: clean recomp014
diff --git a/testsuite/tests/driver/recomp014/all.T b/testsuite/tests/driver/recomp014/all.T
deleted file mode 100644
index affccd2f7f..0000000000
--- a/testsuite/tests/driver/recomp014/all.T
+++ /dev/null
@@ -1,4 +0,0 @@
-test('recomp014',
-     [ clean_cmd('$MAKE -s clean') ],
-     run_command,
-     ['$MAKE -s --no-print-directory recomp014'])
diff --git a/testsuite/tests/driver/recomp014/recomp014.stdout b/testsuite/tests/driver/recomp014/recomp014.stdout
deleted file mode 100644
index 7d540716f0..0000000000
--- a/testsuite/tests/driver/recomp014/recomp014.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-first run
-compilation IS NOT required
-second run
-False
diff --git a/testsuite/tests/driver/sigof01/Makefile b/testsuite/tests/driver/sigof01/Makefile
index 629d4b656a..84dfc33a9f 100644
--- a/testsuite/tests/driver/sigof01/Makefile
+++ b/testsuite/tests/driver/sigof01/Makefile
@@ -21,9 +21,3 @@ sigof01m:
 	mkdir tmp_sigof01m
 	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof01m --make Main.hs -sig-of "B is main:A" -o tmp_sigof01m/Main
 	tmp_sigof01m/Main
-
-sigof01i:
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --interactive -v0 -ignore-dot-ghci Main.hs -sig-of "B is main:A" < sigof01i.script
-
-sigof01i2:
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --interactive -v0 -ignore-dot-ghci -sig-of "B is main:A" < sigof01i2.script
diff --git a/testsuite/tests/driver/sigof01/all.T b/testsuite/tests/driver/sigof01/all.T
index 50418b9af0..d0cdc3c02c 100644
--- a/testsuite/tests/driver/sigof01/all.T
+++ b/testsuite/tests/driver/sigof01/all.T
@@ -7,13 +7,3 @@ test('sigof01m',
      [ clean_cmd('rm -rf tmp_sigof01m') ],
      run_command,
      ['$MAKE -s --no-print-directory sigof01m'])
-
-test('sigof01i',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory sigof01i'])
-
-test('sigof01i2',
-     normal,
-     run_command,
-     ['$MAKE -s --no-print-directory sigof01i2'])
diff --git a/testsuite/tests/driver/sigof01/sigof01i.script b/testsuite/tests/driver/sigof01/sigof01i.script
deleted file mode 100644
index ba2906d066..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i.script
+++ /dev/null
@@ -1 +0,0 @@
-main
diff --git a/testsuite/tests/driver/sigof01/sigof01i.stdout b/testsuite/tests/driver/sigof01/sigof01i.stdout
deleted file mode 100644
index bb614cd2a0..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-False
-T
-True
diff --git a/testsuite/tests/driver/sigof01/sigof01i2.script b/testsuite/tests/driver/sigof01/sigof01i2.script
deleted file mode 100644
index 3a91e377a3..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i2.script
+++ /dev/null
@@ -1,3 +0,0 @@
-:load B
-:browse B
-:issafe
diff --git a/testsuite/tests/driver/sigof01/sigof01i2.stdout b/testsuite/tests/driver/sigof01/sigof01i2.stdout
deleted file mode 100644
index 1ee81c10d2..0000000000
--- a/testsuite/tests/driver/sigof01/sigof01i2.stdout
+++ /dev/null
@@ -1,9 +0,0 @@
-class Foo a where
-  foo :: a -> a
-  {-# MINIMAL foo #-}
-data T = A.T
-mkT :: T
-x :: Bool
-Trust type is (Module: Safe, Package: trusted)
-Package Trust: Off
-B is trusted!
diff --git a/testsuite/tests/package/package09e.stderr b/testsuite/tests/package/package09e.stderr
index 70c6f22d89..9cd00a2930 100644
--- a/testsuite/tests/package/package09e.stderr
+++ b/testsuite/tests/package/package09e.stderr
@@ -1,5 +1,5 @@
 
 package09e.hs:2:1:
     Ambiguous interface for ‘M’:
-      it is bound as Data.Map by a package flag
       it is bound as Data.Set by a package flag
+      it is bound as Data.Map by a package flag