diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-13 16:18:24 -0800 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-11-16 15:32:56 -0800 |
| commit | ac1a379363618a6f2f17fff65ce9129164b6ef30 (patch) | |
| tree | 65a0154fa86cf8dda560f62ecc6ae7555da65ac7 /testsuite/tests/driver/dynamicToo | |
| parent | 9193629a6d8c7605ba81e62bc7f9a04a8ce65013 (diff) | |
| download | haskell-ac1a379363618a6f2f17fff65ce9129164b6ef30.tar.gz | |
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
Diffstat (limited to 'testsuite/tests/driver/dynamicToo')
| -rw-r--r-- | testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig (renamed from testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot) | 0 | ||||
| -rw-r--r-- | testsuite/tests/driver/dynamicToo/dynamicToo005/Makefile | 8 | ||||
| -rw-r--r-- | testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig (renamed from testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot) | 0 | ||||
| -rw-r--r-- | testsuite/tests/driver/dynamicToo/dynamicToo006/Makefile | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig index 75d621cfec..75d621cfec 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hs-boot +++ b/testsuite/tests/driver/dynamicToo/dynamicToo005/A005.hsig 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.hsig index f79d5d334f..f79d5d334f 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hs-boot +++ b/testsuite/tests/driver/dynamicToo/dynamicToo006/A.hsig 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) |