From ac1a379363618a6f2f17fff65ce9129164b6ef30 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Fri, 13 Nov 2015 16:18:24 -0800 Subject: Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging." Summary: This reverts commit 06d46b1e4507e09eb2a7a04998a92610c8dc6277. This also has a Haddock submodule update. Test Plan: validate Reviewers: simonpj, austin, bgamari Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1475 --- testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot | 5 ----- testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig | 5 +++++ testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile | 8 ++------ testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot | 5 ----- testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig | 5 +++++ testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile | 2 -- 6 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot create mode 100644 testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig delete mode 100644 testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot create mode 100644 testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig (limited to 'testsuite/tests/driver/dynamicToo') diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot deleted file mode 100644 index 75d621cfec..0000000000 --- a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot +++ /dev/null @@ -1,5 +0,0 @@ - -module A005 where - -data Maybe a = Nothing | Just a - diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig new file mode 100644 index 0000000000..75d621cfec --- /dev/null +++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig @@ -0,0 +1,5 @@ + +module A005 where + +data Maybe a = Nothing | Just a + diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile b/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile index a08827a92d..617510eec4 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile +++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile @@ -5,15 +5,11 @@ include $(TOP)/mk/test.mk checkExists = [ -f $1 ] || echo $1 missing .PHONY: dynamicToo005 -# Check that "-c -dynamic-too" works with signatures +# Check that "-c -dynamic-too" works with .hsig dynamicToo005: "$(TEST_HC)" $(TEST_HC_OPTS) -dynamic-too -v0 \ -sig-of A005=base:Prelude \ - -c A005.hs-boot - $(call checkExists,A005.o-boot) - $(call checkExists,A005.hi-boot) - "$(TEST_HC)" $(TEST_HC_OPTS) -dynamic-too -v0 \ - --merge-requirements A005 + -c A005.hsig $(call checkExists,A005.o) $(call checkExists,A005.hi) $(call checkExists,A005.dyn_o) diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot b/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot deleted file mode 100644 index f79d5d334f..0000000000 --- a/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot +++ /dev/null @@ -1,5 +0,0 @@ - -module A where - -data Maybe a = Nothing | Just a - diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig b/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig new file mode 100644 index 0000000000..f79d5d334f --- /dev/null +++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig @@ -0,0 +1,5 @@ + +module A where + +data Maybe a = Nothing | Just a + diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile b/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile index 6e025f8322..497f2c0942 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile +++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile @@ -11,10 +11,8 @@ dynamicToo006: -sig-of A=base:Prelude \ --make B $(call checkExists,A.o) - $(call checkExists,A.o-boot) $(call checkExists,B.o) $(call checkExists,A.hi) - $(call checkExists,A.hi-boot) $(call checkExists,B.hi) $(call checkExists,A.dyn_o) $(call checkExists,B.dyn_o) -- cgit v1.2.1