diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-03-30 21:43:51 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2016-03-30 22:49:06 +0200 |
commit | e9c2555ac666912f7dff56448ced4bfa06d14e76 (patch) | |
tree | 3a884a5b82d9ee30802c3127897fc7c9ebc3df88 /testsuite/tests/driver | |
parent | 58bbb40ba23860df2ede1275493ef32ba69a2083 (diff) | |
download | haskell-e9c2555ac666912f7dff56448ced4bfa06d14e76.tar.gz |
Don't require -hide-all-packages for MIN_VERSION_* macros
Define MIN_VERSION_pkgname and VERSION_pkgname macros for all exposed
packages, without requiring -hide-all-packages.
See #10970 comment 7-10 for discussion.
Reviewers: duncan, ezyang, bgamari, austin
Reviewed By: ezyang
Subscribers: hvr, rwbarton
Differential Revision: https://phabricator.haskell.org/D1869
GHC Trac Issues: #10970
Diffstat (limited to 'testsuite/tests/driver')
-rw-r--r-- | testsuite/tests/driver/T10970a.hs | 8 | ||||
-rw-r--r-- | testsuite/tests/driver/T10970a.stdout | 2 | ||||
-rw-r--r-- | testsuite/tests/driver/T3389.hs | 4 | ||||
-rw-r--r-- | testsuite/tests/driver/all.T | 3 |
4 files changed, 3 insertions, 14 deletions
diff --git a/testsuite/tests/driver/T10970a.hs b/testsuite/tests/driver/T10970a.hs deleted file mode 100644 index 8e7aa6060c..0000000000 --- a/testsuite/tests/driver/T10970a.hs +++ /dev/null @@ -1,8 +0,0 @@ -{-# LANGUAGE CPP #-} -main = do -#ifndef VERSION_containers - putStrLn "OK" -#endif -#ifndef MIN_VERSION_base - putStrLn "OK" -#endif diff --git a/testsuite/tests/driver/T10970a.stdout b/testsuite/tests/driver/T10970a.stdout deleted file mode 100644 index 2c94e48371..0000000000 --- a/testsuite/tests/driver/T10970a.stdout +++ /dev/null @@ -1,2 +0,0 @@ -OK -OK diff --git a/testsuite/tests/driver/T3389.hs b/testsuite/tests/driver/T3389.hs index c6a5666db8..e574fc4c1c 100644 --- a/testsuite/tests/driver/T3389.hs +++ b/testsuite/tests/driver/T3389.hs @@ -6,7 +6,7 @@ main :: IO () main = putStrLn [A, --- /* +-- CPP treats this as the beginning of a multiline C-style comment: /usr/local/* 'b', --- */ +-- And */ close it. By passing `-optP -C` we tell CPP not to delete it. 'c'] diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index 2798dd5ba3..23aeb99a46 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -468,8 +468,7 @@ test('T365', test('T9360a', normal, run_command, ['{compiler} --interactive -e "" -ignore-dot-ghci']) test('T9360b', normal, run_command, ['{compiler} -e "" --interactive -ignore-dot-ghci']) -test('T10970', normal, compile_and_run, ['-hide-all-packages -package base -package containers']) -test('T10970a', normal, compile_and_run, ['']) +test('T10970', normal, compile_and_run, ['']) test('T4931', normal, compile_and_run, ['']) test('T11182', normal, compile_and_run, ['']) test('T11381', normal, compile_fail, ['']) |