summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@devup.no>2020-03-24 11:27:30 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-03-29 17:31:27 -0400
commit7e7cb714173652165b8372c3450f4ccd6a377497 (patch)
treeecb87c864d246ad35b4f826e152aa10d7d50aa00
parente54500c12de051cb9695728d27c812e5160593ee (diff)
downloadhaskell-7e7cb714173652165b8372c3450f4ccd6a377497.tar.gz
testsuite: Remove test that dlopens a PIE object.
glibc 2.30 disallowed dlopening PIE objects, so just remove the test. Fixes #17952.
-rw-r--r--testsuite/tests/dynlibs/Makefile4
-rw-r--r--testsuite/tests/dynlibs/T13702.hs5
-rw-r--r--testsuite/tests/dynlibs/T13702.stdout1
-rw-r--r--testsuite/tests/dynlibs/T13702a.hs12
4 files changed, 1 insertions, 21 deletions
diff --git a/testsuite/tests/dynlibs/Makefile b/testsuite/tests/dynlibs/Makefile
index 7201cfdbdb..2a530a5aeb 100644
--- a/testsuite/tests/dynlibs/Makefile
+++ b/testsuite/tests/dynlibs/Makefile
@@ -60,6 +60,4 @@ T5373:
.PHONY: T13702
T13702:
'$(TEST_HC)' -v0 -dynamic -rdynamic -fPIC -pie T13702.hs
- '$(TEST_HC)' -v0 -dynamic T13702a.hs
- ./T13702 # first make sure executable itself works
- ./T13702a # then try dynamically loading it as library
+ ./T13702
diff --git a/testsuite/tests/dynlibs/T13702.hs b/testsuite/tests/dynlibs/T13702.hs
index 5af4085c03..6031191cef 100644
--- a/testsuite/tests/dynlibs/T13702.hs
+++ b/testsuite/tests/dynlibs/T13702.hs
@@ -2,8 +2,3 @@
main :: IO ()
main = putStrLn "hello world"
-
-foreign export ccall "hello" hello :: IO ()
-
-hello :: IO ()
-hello = putStrLn "hello world again"
diff --git a/testsuite/tests/dynlibs/T13702.stdout b/testsuite/tests/dynlibs/T13702.stdout
index a2b2a712d0..3b18e512db 100644
--- a/testsuite/tests/dynlibs/T13702.stdout
+++ b/testsuite/tests/dynlibs/T13702.stdout
@@ -1,2 +1 @@
hello world
-hello world again
diff --git a/testsuite/tests/dynlibs/T13702a.hs b/testsuite/tests/dynlibs/T13702a.hs
deleted file mode 100644
index 5078852f6e..0000000000
--- a/testsuite/tests/dynlibs/T13702a.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
-
-import Foreign
-import System.Posix.DynamicLinker
-
-main :: IO ()
-main = do
- dl <- dlopen "./T13702" [RTLD_NOW]
- funptr <- dlsym dl "hello" :: IO (FunPtr (IO ()))
- mkAction funptr
-
-foreign import ccall "dynamic" mkAction :: FunPtr (IO ()) -> IO ()