8 files changed, 4 insertions, 38 deletions
diff --git a/testsuite/tests/driver/sigof01/B.hs-boot b/testsuite/tests/driver/sigof01/B.hsig
index 289d3bcb18..289d3bcb18 100644
--- a/testsuite/tests/driver/sigof01/B.hs-boot
+++ b/testsuite/tests/driver/sigof01/B.hsig
diff --git a/testsuite/tests/driver/sigof01/Makefile b/testsuite/tests/driver/sigof01/Makefile
index 8bed672c07..84dfc33a9f 100644
--- a/testsuite/tests/driver/sigof01/Makefile
+++ b/testsuite/tests/driver/sigof01/Makefile
@@ -11,8 +11,7 @@ sigof01:
 	rm -rf tmp_sigof01
 	mkdir tmp_sigof01
 	'$(TEST_HC)' $(S01_OPTS) -c A.hs
-	'$(TEST_HC)' $(S01_OPTS) -c B.hs-boot -sig-of "B is main:A"
-	'$(TEST_HC)' $(S01_OPTS) --merge-requirements B
+	'$(TEST_HC)' $(S01_OPTS) -c B.hsig -sig-of "B is main:A"
 	'$(TEST_HC)' $(S01_OPTS) -c Main.hs
 	'$(TEST_HC)' $(S01_OPTS) tmp_sigof01/A.o tmp_sigof01/Main.o -o tmp_sigof01/Main
 	tmp_sigof01/Main
@@ -22,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 5606127f06..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',
-     [],
-     run_command,
-     ['$MAKE -s --no-print-directory sigof01i'])
-
-test('sigof01i2',
-     [],
-     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/driver/sigof01/sigof01m.stdout b/testsuite/tests/driver/sigof01/sigof01m.stdout
index 35190ae143..a7fdd8298e 100644
--- a/testsuite/tests/driver/sigof01/sigof01m.stdout
+++ b/testsuite/tests/driver/sigof01/sigof01m.stdout
@@ -1,7 +1,6 @@
-[1 of 4] Compiling A                ( A.hs, tmp_sigof01m/A.o )
-[2 of 4] Compiling B[boot]          ( B.hs-boot, tmp_sigof01m/B.o-boot )
-[3 of 4] Compiling B[merge]         ( B.hi, tmp_sigof01m/B.o )
-[4 of 4] Compiling Main             ( Main.hs, tmp_sigof01m/Main.o )
+[1 of 3] Compiling A                ( A.hs, tmp_sigof01m/A.o )
+[2 of 3] Compiling B[sig of A]      ( B.hsig, nothing )
+[3 of 3] Compiling Main             ( Main.hs, tmp_sigof01m/Main.o )
 Linking tmp_sigof01m/Main ...
 False
 T